Merge remote branch 'origin/master' into editvar 91/691/1
authorBruno JOFRET <bruno.jofret@scilab.org>
Thu, 20 May 2010 13:12:15 +0000 (15:12 +0200)
committerBruno JOFRET <bruno.jofret@scilab.org>
Thu, 20 May 2010 13:12:15 +0000 (15:12 +0200)
commitb1a5f0adddcb10e6baafc03627777c14f15c1461
tree8f9ff27773f26c4c86328c3921e331122cba3ae5
parent59702160b83af483be722d0f914760dea8693c98
parent2c084fc24ac6a8b875e7e57a605a4b06cc814f36
Merge remote branch 'origin/master' into editvar

Conflicts:
scilab/Scilab.sln
scilab/Scilab_f2c.sln
scilab/configure
scilab/modules/Makefile.in

Change-Id: I962c3ee191dd9207b4d3afa11dc9aa3dd60a014f
13 files changed:
scilab/Scilab.sln
scilab/Scilab_f2c.sln
scilab/configure
scilab/configure.ac
scilab/etc/classpath.xml.in
scilab/etc/classpath.xml.vc
scilab/etc/modules.xml.in
scilab/etc/modules.xml.vc
scilab/modules/Makefile.am
scilab/modules/Makefile.in
scilab/modules/ui_data/Makefile.in
scilab/scilab-lib.properties.in
scilab/scilab-lib.properties.vc