Merge branch 'master' of git@git.scilab.org:scilab
authorSylvestre Ledru <sylvestre.ledru@scilab.org>
Fri, 28 Aug 2009 10:37:07 +0000 (12:37 +0200)
committerSylvestre Ledru <sylvestre.ledru@scilab.org>
Fri, 28 Aug 2009 10:37:07 +0000 (12:37 +0200)
commit4d480695390c3b5bcf9c6c9eb1e7b573bbd618bf
tree89fd9f85d248451f33a82e2f5b81f8219b733d51
parent750d04124966bbd484e52c982824a932336a81a2
parent7fd5317d685af331440928f660429594753b5998
Merge branch 'master' of git@git.scilab.org:scilab

Conflicts:
scilab/modules/elementary_functions/Makefile.in
scilab/modules/elementary_functions/Makefile.am
scilab/modules/elementary_functions/Makefile.in
scilab/modules/optimization/Makefile.am
scilab/modules/optimization/Makefile.in
scilab/modules/polynomials/Makefile.am
scilab/modules/polynomials/Makefile.in