Merge branch 'master' of git@git.scilab.org:scilab
authorSylvestre Ledru <sylvestre.ledru@scilab.org>
Thu, 27 Aug 2009 11:05:22 +0000 (13:05 +0200)
committerSylvestre Ledru <sylvestre.ledru@scilab.org>
Thu, 27 Aug 2009 11:05:22 +0000 (13:05 +0200)
commitf686344ba275720ebc4a7ccf17b0af2d77f6f8a8
treeef4fcdd52e5efb39e15421e08583869e0b1c5fa8
parentac9796a1f4eefe5c3f85f0a9bc19645bed8d400f
parentb45eefac069744ca00a0c11892fb1bbe4013aad8
Merge branch 'master' of git@git.scilab.org:scilab

Conflicts:
scilab/modules/elementary_functions/Makefile.am
scilab/modules/elementary_functions/Makefile.in
scilab/modules/cacsd/Makefile.am
scilab/modules/cacsd/Makefile.in
scilab/modules/elementary_functions/Makefile.am
scilab/modules/elementary_functions/Makefile.in
scilab/modules/elementary_functions/src/fortran/elementary_functions_f.vfproj
scilab/modules/elementary_functions/src/fortran/elementary_functions_f2c.vcproj
scilab/modules/elementary_functions/src/fortran/linpack/wgefa.f