Merge commit 'origin/master' into editvar
authorBruno JOFRET <bruno.jofret@scilab.org>
Mon, 29 Mar 2010 07:05:32 +0000 (09:05 +0200)
committerBruno JOFRET <bruno.jofret@scilab.org>
Mon, 29 Mar 2010 07:05:32 +0000 (09:05 +0200)
commit66ebd40216025b754b651b9b5e3f6f14a917add9
treec7998b4a290d54fd1b577af5686c84f14e37e9f7
parent97bc1930e9d8458c67e84e501418cd7636b01b6e
parent07eab843be04dfb8ed4bec6364a0f118be1a08d1
Merge commit 'origin/master' into editvar
scilab/Makefile.in
scilab/Scilab.sln
scilab/Scilab_f2c.sln
scilab/configure
scilab/configure.ac
scilab/etc/classpath.xml.vc
scilab/modules/Makefile.in
scilab/modules/core/includes/machine.h.in
scilab/modules/xcos/Makefile.in
scilab/scilab-lib.properties.vc