Merge remote branch 'origin/5.2'
authorSylvestre Ledru <sylvestre.ledru@scilab.org>
Mon, 15 Feb 2010 14:25:59 +0000 (15:25 +0100)
committerSylvestre Ledru <sylvestre.ledru@scilab.org>
Mon, 15 Feb 2010 14:25:59 +0000 (15:25 +0100)
commitc523b1358d8ea7a578f22edc011c4077aeef4aaa
tree03b0afb11b4ac4f9b5b6c2f4bc6908e86ee7b92d
parent9c61e07470b2691e5dd1be660ad367e6dcd0d4f2
parent362988b1133a09c67b43aef4a40cca732bae2310
Merge remote branch 'origin/5.2'

Conflicts:
scilab/CHANGES_5.2.X
scilab/configure
scilab/configure.ac
scilab/etc/classpath.xml.vc
scilab/m4/docbook.m4
scilab/modules/graphics/graphics.iss
scilab/scilab-lib.properties.vc
13 files changed:
scilab/CHANGES_5.2.X
scilab/configure
scilab/configure.ac
scilab/m4/docbook.m4
scilab/modules/atoms/macros/atomsInstall.sci
scilab/modules/dynamic_link/Makefile.in
scilab/modules/graphics/Makefile.in
scilab/modules/history_manager/Makefile.in
scilab/modules/matio/Makefile.in
scilab/modules/optimization/Makefile.in
scilab/modules/string/Makefile.am
scilab/modules/string/Makefile.in
scilab/scilab-lib.properties.vc