Merge remote-tracking branch 'refs/remotes/origin/master' into graphic 77/5977/1
authorAllan CORNET <allan.cornet@scilab.org>
Thu, 19 Jan 2012 13:16:04 +0000 (14:16 +0100)
committerAllan CORNET <allan.cornet@scilab.org>
Thu, 19 Jan 2012 13:16:04 +0000 (14:16 +0100)
commite7f5bce7f69849b582f17c9e7842f19e0d932d26
tree4f536b574984ca4ebca9702c0ec8d0b1a5df2727
parent1c1399f6dfaa9863048a64b4873205456d05f392
parent2738d21aafe8263060bd5ee3061792875c9af6a3
Merge remote-tracking branch 'refs/remotes/origin/master' into graphic

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

Change-Id: I89a9eeaaf17ab57daecab07dfb7031dc95158101
scilab/CHANGES_5.4.X
scilab/Scilab.sln
scilab/Scilab_f2c.sln
scilab/Visual-Studio-settings/ant-all/ant-all.vcxproj
scilab/modules/Makefile.am
scilab/modules/commons/Makefile.in
scilab/modules/xcos/src/java/org/scilab/modules/xcos/XcosTab.java
scilab/scilab-lib.properties.vc