Merge remote branch 'origin/master' into graphic 24/1824/1
authorBruno JOFRET <bruno.jofret@scilab.org>
Mon, 6 Sep 2010 16:21:24 +0000 (18:21 +0200)
committerBruno JOFRET <bruno.jofret@scilab.org>
Mon, 6 Sep 2010 16:21:24 +0000 (18:21 +0200)
commit411aee568e07d93d4e18eddcfbbe1dc566dc38d4
tree2f94a39d5dc7bac67ae3bcf25d2b6271380b05f7
parenta560e8baae370db50196c5d18afda08d4c7ebdac
parentf86bc9095fe2a01c1f6564c07c3ee75eb25ccf09
Merge remote branch 'origin/master' into graphic

Conflicts:
scilab/configure
scilab/modules/core/src/c/dynamic_gateways.c
scilab/modules/core/src/c/dynamic_gateways.h
scilab/modules/data_structures/src/fortran/data_structures_f.def
scilab/modules/graphics/src/c/GetProperty.c

Change-Id: I49075b609e7143f25de092875c3d2d7c55eac969
24 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/modules.xml.in
scilab/etc/modules.xml.vc
scilab/modules/Makefile.am
scilab/modules/Makefile.in
scilab/modules/core/src/c/dynamic_gateways.c
scilab/modules/core/src/c/dynamic_gateways.h
scilab/modules/graphic_objects/Makefile.in
scilab/modules/graphics/Makefile.am
scilab/modules/graphics/Makefile.in
scilab/modules/graphics/src/c/GetProperty.c
scilab/modules/graphics/src/c/getHandleProperty/GetHashTable.c
scilab/modules/graphics/src/c/getHandleProperty/get_axes_reverse_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_log_flags_property.c
scilab/modules/gui/Makefile.am
scilab/modules/gui/Makefile.in
scilab/scilab-lib.properties.in
scilab/scilab-lib.properties.vc