Merge remote-tracking branch 'origin/master' into graphic 32/4632/1
authorBruno JOFRET <bruno.jofret@scilab.org>
Thu, 28 Jul 2011 15:04:34 +0000 (17:04 +0200)
committerBruno JOFRET <bruno.jofret@scilab.org>
Thu, 28 Jul 2011 15:04:55 +0000 (17:04 +0200)
commit1b614710e1449fe765130aacaa5b53b6f9dccede
treec5cc505536e2abf348b86c8ec7fe459de27298b9
parenta6eb8571e350f3f4775ae4e4defa239afd61a182
parentca84db5c62f1e1de6f036e3e74dec5181ddd949d
Merge remote-tracking branch 'origin/master' into graphic

Conflicts:
scilab/Scilab.sln
scilab/Scilab_f2c.sln
scilab/Visual-Studio-settings/ant-all/ant-all.vcxproj
scilab/configure
scilab/modules/Makefile.in
scilab/modules/core/src/c/InitScilab.c
scilab/modules/scicos/sci_gateway/c/sci_permutobj.c
scilab/modules/scicos_blocks/src/c/scoMisc.c
scilab/modules/shell/Makefile.in

Change-Id: I637d2b34a5fc02febd234beaa568ee6baff14409
36 files changed:
scilab/CHANGES_5.4.X
scilab/Makefile.in
scilab/Scilab.sln
scilab/Scilab_f2c.sln
scilab/Visual-Studio-settings/ant-all/ant-all.vcxproj
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/console/Makefile.in
scilab/modules/core/Makefile.in
scilab/modules/core/includes/callinterf.h
scilab/modules/core/src/c/InitScilab.c
scilab/modules/core/src/c/callinterf.c
scilab/modules/elementary_functions/Makefile.in
scilab/modules/fileio/Makefile.in
scilab/modules/graphics/graphics.vcxproj
scilab/modules/gui/Makefile.am
scilab/modules/gui/Makefile.in
scilab/modules/gui/sci_gateway/cpp/sci_toprint.cpp
scilab/modules/output_stream/Makefile.in
scilab/modules/scicos/Makefile.in
scilab/modules/scicos_blocks/Makefile.am
scilab/modules/scicos_blocks/Makefile.in
scilab/modules/scicos_blocks/src/c/scicos_blocks.vcxproj
scilab/modules/scicos_blocks/src/c/scoMisc.c
scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/utils/NavigatorWindow.java
scilab/modules/special_functions/Makefile.in
scilab/modules/xcos/src/java/org/scilab/modules/xcos/graph/XcosDiagram.java
scilab/scilab-lib.properties.in
scilab/scilab-lib.properties.vc