Merge remote-tracking branch 'refs/remotes/origin/master' into preferences 83/5183/1
authorAllan CORNET <allan.cornet@scilab.org>
Mon, 10 Oct 2011 09:38:06 +0000 (11:38 +0200)
committerAllan CORNET <allan.cornet@scilab.org>
Mon, 10 Oct 2011 09:38:06 +0000 (11:38 +0200)
commit3258da11f2d90b635966b7fea3bcc4b6cc5c8f0e
treef88eee521db50fed6d56441df12d8369bad4269b
parent0beb459febc4e54b54d9998cda022f0db79a1c65
parentf844266d865a78e0fd87af233e2dd5fca5af1dcd
Merge remote-tracking branch 'refs/remotes/origin/master' into preferences

Conflicts:
scilab/Scilab.sln
scilab/Scilab_f2c.sln
scilab/configure
scilab/configure.ac
scilab/etc/modules.xml.in
scilab/etc/modules.xml.vc
scilab/modules/Makefile.am
scilab/modules/Makefile.in
scilab/modules/core/includes/callinterf.h
scilab/modules/core/src/c/callinterf.c
scilab/modules/core/src/c/dynamic_gateways.c
scilab/modules/core/src/c/dynamic_gateways.h
scilab/tools/innosetup/files.iss

Change-Id: Ibb82afcd6cfdc6393d043f8e61a67ff02cc20251
16 files changed:
scilab/Scilab.sln
scilab/Scilab_f2c.sln
scilab/build.incl.xml
scilab/configure
scilab/configure.ac
scilab/etc/modules.xml.in
scilab/etc/modules.xml.vc
scilab/etc/scilab.start
scilab/modules/Makefile.am
scilab/modules/Makefile.in
scilab/modules/core/includes/callinterf.h
scilab/modules/core/src/c/callinterf.c
scilab/modules/core/src/c/dynamic_gateways.c
scilab/modules/core/src/c/dynamic_gateways.h
scilab/modules/preferences/sci_gateway/preferences_gateway.xml
scilab/tools/innosetup/files.iss