Merge remote-tracking branch 'refs/remotes/origin/master' into preferences 15/5915/1
authorAllan CORNET <allan.cornet@scilab.org>
Fri, 13 Jan 2012 10:37:16 +0000 (11:37 +0100)
committerAllan CORNET <allan.cornet@scilab.org>
Fri, 13 Jan 2012 10:37:16 +0000 (11:37 +0100)
commit518fd63f451ac36d12d989ebfad978cfdac3cf1a
treef94d24020eae5cda5fb922993e7666b4ed00b81e
parentdc4fb40ea8f531acc42f38365545584ba99eff3b
parent4340031b3d50aa12b3211800f038958159fb9ce7
Merge remote-tracking branch 'refs/remotes/origin/master' into preferences

Conflicts:
scilab/Visual-Studio-settings/ant-all/ant-all.vcxproj

Change-Id: Ie8736a54af417e378ba699bc9cf3b99cc438de78
scilab/Scilab.sln
scilab/Scilab_f2c.sln
scilab/Visual-Studio-settings/ant-all/ant-all.vcxproj
scilab/configure.ac
scilab/modules/preferences/src/java/preferences-JAVA.vcxproj