Merge remote-tracking branch 'origin/master' into preferences 27/6527/1
authorVincent COUVERT <vincent.couvert@scilab.org>
Wed, 29 Feb 2012 14:00:46 +0000 (15:00 +0100)
committerVincent COUVERT <vincent.couvert@scilab.org>
Wed, 29 Feb 2012 14:00:46 +0000 (15:00 +0100)
commit6dc6f985fba0ab78a6881d10348ae75b1c313861
tree4d457a85e0290d43b5c90f5305a77dfef21b4f05
parent0145c14fd029d98a677e0285bbce5d75f963e659
parent829833787758a0a3efa4451e1dd2fc18c76698e0
Merge remote-tracking branch 'origin/master' into preferences

Conflicts:
scilab/Scilab.sln
scilab/Scilab_f2c.sln

Change-Id: I449d0f4af484552854a27d0efa4a84b40e25ab11
13 files changed:
scilab/Scilab.sln
scilab/Scilab_f2c.sln
scilab/build.incl.xml
scilab/configure
scilab/configure.ac
scilab/etc/classpath.xml.in
scilab/etc/classpath.xml.vc
scilab/etc/scilab.start
scilab/modules/Makefile.am
scilab/modules/Makefile.in
scilab/modules/preferences/Makefile.in
scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/SciNotes.java
scilab/tools/innosetup/code_modules.iss