Merge remote branch 'origin/master' into graphic 50/2250/1
authorPierre LANDO <pierre.lando@scilab.org>
Fri, 8 Oct 2010 14:09:48 +0000 (16:09 +0200)
committerPierre LANDO <pierre.lando@scilab.org>
Fri, 8 Oct 2010 14:09:48 +0000 (16:09 +0200)
commit65a39dd4537a98403fcb43e22a0ff9a88b5a10c2
tree4623fe289ad0451419bb916f7d86cfff8df72db4
parentc818cf9c3f7b216aadbc6a4fa206508666fc3e72
parent519b2975187acc2fba94e494d31a30375fcf8d62
Merge remote branch 'origin/master' into graphic

Conflicts:
scilab/modules/core/src/c/dynamic_gateways.c
17 files changed:
scilab/Scilab.sln
scilab/Scilab_f2c.sln
scilab/build.incl.xml
scilab/configure
scilab/configure.ac
scilab/modules/Makefile.am
scilab/modules/Makefile.in
scilab/modules/core/includes/callinterf.h
scilab/modules/core/includes/version.h
scilab/modules/core/src/c/dynamic_gateways.c
scilab/modules/core/src/c/dynamic_gateways.h
scilab/modules/graphics/macros/%h_p.sci
scilab/modules/gui/Makefile.am
scilab/modules/gui/Makefile.in
scilab/modules/gui/src/c/gui.vcproj
scilab/scilab-lib.properties.in
scilab/scilab-lib.properties.vc