Merge remote-tracking branch 'refs/remotes/origin/master' into desktop 36/5236/1
authorAllan CORNET <allan.cornet@scilab.org>
Thu, 13 Oct 2011 12:57:19 +0000 (14:57 +0200)
committerAllan CORNET <allan.cornet@scilab.org>
Thu, 13 Oct 2011 12:57:19 +0000 (14:57 +0200)
commit7d4b22a2d615e2d06d23478e2a7996bc2cfc6445
tree66a2185cb69a5458a0f194a76c192e4218e9e5cd
parent0785f27ee52c2876bd3649a1924a103c39bf0279
parentf76d40c5116aff9d9bdf08bf0544f97c6fa912c3
Merge remote-tracking branch 'refs/remotes/origin/master' into desktop

Conflicts:
scilab/CHANGES_5.4.X

Change-Id: I03d632d3048fbd5e55fc6791a3c83545e0e7c758
scilab/CHANGES_5.4.X
scilab/configure
scilab/configure.ac
scilab/modules/commons/src/c/commons.vcxproj
scilab/modules/fileio/fileio.vcxproj
scilab/modules/gui/src/c/gui.vcxproj
scilab/modules/ui_data/src/c/ui_data.vcxproj