[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/search.marc search.tmpl,1.7,1.8

[Paul POULAIN]

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/search.marc
In directory 
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20915/koha-tmpl/intranet-tmpl/default/fr/search.marc

Modified Files:
        search.tmpl 
Log Message:
merging 2.2 branch with head. Sorry for not making it before, many many commits 
done here

Index: search.tmpl
===================================================================
RCS file: 
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/search.marc/search.tmpl,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** search.tmpl 5 Jan 2005 14:35:22 -0000       1.7
--- search.tmpl 1 Mar 2005 13:41:02 -0000       1.8
***************
*** 136,140 ****
                                <option value="100">100</option>
                        </select>
!               Commandé par
                        <select name="orderby" size="1">
                                <option value="biblio.title">Titre</option>
--- 136,140 ----
                                <option value="100">100</option>
                        </select>
!               Trié par
                        <select name="orderby" size="1">
                                <option value="biblio.title">Titre</option>