Merge remote-tracking branch 'refs/remotes/origin/master' into YaSp 42/5942/2
authorAllan CORNET <allan.cornet@scilab.org>
Mon, 16 Jan 2012 15:59:19 +0000 (16:59 +0100)
committerVincent COUVERT <vincent.couvert@scilab.org>
Tue, 17 Jan 2012 08:37:28 +0000 (09:37 +0100)
commitba237028c1c23902179d928dc9bcd0ad2338896d
tree91f2e1e0ec0a1a8af9b837bf6ffc978d0a446aa4
parent158ded1146180e37230e2ef13092071bd4c87562
parent3756a364e77fa0d189e602a5d10311a9d27d8136
Merge remote-tracking branch 'refs/remotes/origin/master' into YaSp

Conflicts:
scilab/Makefile.am
scilab/Makefile.in
scilab/Scilab.sln
scilab/Scilab_f2c.sln
scilab/configure
scilab/modules/Makefile.am
scilab/modules/Makefile.in
scilab/modules/console/sci_gateway/c/sci_lines.c
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/elementary_functions/sci_gateway/c/sci_frexp.c
scilab/modules/helptools/data/pages/homepage-en_US.html
scilab/modules/helptools/data/pages/homepage-fr_FR.html
scilab/modules/history_browser/Makefile.am
scilab/modules/history_browser/src/c/LibScilab_Import.def
scilab/modules/history_browser/src/c/history_browser.vcxproj
scilab/modules/history_browser/src/c/history_browser.vcxproj.filters
scilab/modules/io/includes/gw_io.h
scilab/modules/libscilab-cli/Makefile.am
scilab/modules/libscilab-cli/Makefile.in
scilab/modules/types/Makefile.am
scilab/modules/types/Makefile.in
scilab/modules/types/src/java/org/scilab/modules/types/GetScilabVariableJNI.java
scilab/modules/types/src/jni/getScilabVariable.i
scilab/modules/ui_data/src/java/ui_data-JAVA.vcxproj

Change-Id: Id3705d91a589742c47f35fb10e1c3307e09f5cc9
32 files changed:
scilab/Makefile.am
scilab/Makefile.in
scilab/configure
scilab/configure.ac
scilab/etc/classpath.xml.vc
scilab/modules/Makefile.am
scilab/modules/Makefile.in
scilab/modules/action_binding/src/java/action_binding-JAVA.vcxproj
scilab/modules/commons/src/java/commons-JAVA.vcxproj
scilab/modules/completion/src/java/completion-JAVA.vcxproj
scilab/modules/console/src/java/console-JAVA.vcxproj
scilab/modules/core/src/java/core-JAVA.vcxproj
scilab/modules/graph/src/java/graph-JAVA.vcxproj
scilab/modules/graphic_export/src/java/graphic_export-JAVA.vcxproj
scilab/modules/graphics/graphics.iss
scilab/modules/gui/Makefile.am
scilab/modules/gui/Makefile.in
scilab/modules/gui/src/java/gui-JAVA.vcxproj
scilab/modules/hdf5/src/java/hdf5-JAVA.vcxproj
scilab/modules/helptools/src/java/helptools-JAVA.vcxproj
scilab/modules/history_browser/history_browser.iss
scilab/modules/history_browser/includes/CommandHistory_Wrap.h
scilab/modules/history_browser/src/cpp/CommandHistory_Wrap.cpp
scilab/modules/history_browser/src/java/history_browser-JAVA.vcxproj
scilab/modules/history_browser/src/nohistory_browser/CommandHistory_Wrap_Fake.c
scilab/modules/javasci/src/java/javasci-JAVA.vcxproj
scilab/modules/jvm/src/java/jvm-JAVA.vcxproj
scilab/modules/localization/src/java/localization-JAVA.vcxproj
scilab/modules/renderer/src/java/renderer-JAVA.vcxproj
scilab/modules/scinotes/src/java/scinotes-JAVA.vcxproj
scilab/modules/types/src/java/types-JAVA.vcxproj
scilab/modules/xcos/src/java/xcos-JAVA.vcxproj