Merge remote-tracking branch 'origin/master' into similan 50/12250/1
authorAntoine ELIAS <antoine.elias@scilab-enterprises.com>
Fri, 9 Aug 2013 08:42:50 +0000 (10:42 +0200)
committerAntoine ELIAS <antoine.elias@scilab-enterprises.com>
Fri, 9 Aug 2013 08:43:18 +0000 (10:43 +0200)
commit591dc16dac5abbaea6cd21b1f5bd48f26905b370
tree3ac7177eaf25102fd7826e727c8223cc51e54edf
parent341a863cadb7265420a2578710e4d91de8f6c7ad
parentd25fba5ecbef4874cdf47f699f1aea1c0e8c2a12
Merge remote-tracking branch 'origin/master' into similan

Conflicts:
scilab/modules/graphic_objects/includes/DataLoader.hxx
scilab/modules/graphic_objects/includes/MatPlotDecomposer.hxx
scilab/modules/graphic_objects/src/cpp/NgonGridDataDecomposer.cpp
scilab/modules/graphic_objects/src/cpp/NgonGridMatplotData.cpp
scilab/modules/graphic_objects/src/cpp/NgonGridMatplotDataDecomposer.cpp
scilab/modules/graphic_objects/src/cpp/Triangulator.cpp
scilab/modules/graphic_objects/src/cpp/getGraphicObjectProperty.cpp
scilab/modules/graphic_objects/src/cpp/setGraphicObjectProperty.cpp
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/DataLoader.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/DataLoaderJNI.java
scilab/modules/graphic_objects/src/jni/DataLoader_wrap.c
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvasImpl.java
scilab/modules/javasci/src/java/org/scilab/modules/javasci/Scilab.java
scilab/modules/types/includes/ScilabToJava.hxx
scilab/modules/types/src/cpp/ScilabToJava.cpp
scilab/modules/types/src/java/org/scilab/modules/types/GetScilabVariable.java
scilab/modules/types/src/java/org/scilab/modules/types/GetScilabVariableJNI.java
scilab/modules/types/src/jni/ScilabVariables.cpp
scilab/modules/types/src/jni/ScilabVariables.giws.xml
scilab/modules/types/src/jni/ScilabVariables.hxx
scilab/modules/types/src/jni/ScilabVariablesRefresh.cpp
scilab/modules/types/src/jni/ScilabVariablesRefresh.hxx
scilab/modules/types/src/jni/getScilabVariable_wrap.c

Change-Id: I92d39551334ff476c757d59c28c5b4efbeb6443b
75 files changed:
scilab/modules/action_binding/src/jni/Signal.cpp
scilab/modules/action_binding/src/jni/Signal.hxx
scilab/modules/console/src/jni/CallScilabBridge.cpp
scilab/modules/console/src/jni/CallScilabBridge.hxx
scilab/modules/graphic_export/src/jni/Driver.cpp
scilab/modules/graphic_export/src/jni/Driver.hxx
scilab/modules/graphic_export/src/jni/FileExporter.cpp
scilab/modules/graphic_export/src/jni/FileExporter.hxx
scilab/modules/graphic_export/src/jni/JOGLConstant.cpp
scilab/modules/graphic_export/src/jni/JOGLConstant.hxx
scilab/modules/graphic_objects/src/cpp/NgonGridMatplotDataDecomposer.cpp
scilab/modules/graphic_objects/src/cpp/Triangulator.cpp
scilab/modules/graphic_objects/src/jni/CallGraphicController.cpp
scilab/modules/graphic_objects/src/jni/CallGraphicController.hxx
scilab/modules/graphic_objects/src/jni/DataLoader_wrap.c
scilab/modules/graphic_objects/src/jni/GraphicObjectBuilder.cpp
scilab/modules/graphic_objects/src/jni/GraphicObjectBuilder.hxx
scilab/modules/graphic_objects/src/jni/ScilabNativeView_wrap.c
scilab/modules/graphics/Makefile.am
scilab/modules/graphics/Makefile.in
scilab/modules/graphics/graphics.vcxproj
scilab/modules/graphics/graphics.vcxproj.filters
scilab/modules/graphics/src/c/sciCall.c
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvasImpl.java
scilab/modules/gui/src/jni/CallScilabBridge.cpp
scilab/modules/gui/src/jni/CallScilabBridge.hxx
scilab/modules/gui/src/jni/Juigetfile.cpp
scilab/modules/gui/src/jni/Juigetfile.hxx
scilab/modules/gui/src/jni/Jxclick.cpp
scilab/modules/gui/src/jni/Jxclick.hxx
scilab/modules/gui/src/jni/Jxgetmouse.cpp
scilab/modules/gui/src/jni/Jxgetmouse.hxx
scilab/modules/gui/src/jni/LookAndFeelManager.cpp
scilab/modules/gui/src/jni/LookAndFeelManager.hxx
scilab/modules/gui/src/jni/ScilabDisplayTree.cpp
scilab/modules/gui/src/jni/ScilabDisplayTree.hxx
scilab/modules/gui/src/jni/SwingView.cpp
scilab/modules/gui/src/jni/SwingView.hxx
scilab/modules/gui/src/jni/UIElementMapper.cpp
scilab/modules/gui/src/jni/UIElementMapper.hxx
scilab/modules/helptools/src/jni/BuildDocObject.cpp
scilab/modules/helptools/src/jni/BuildDocObject.hxx
scilab/modules/helptools/src/jni/SciDocMain.cpp
scilab/modules/helptools/src/jni/SciDocMain.hxx
scilab/modules/history_browser/src/jni/CommandHistory.cpp
scilab/modules/history_browser/src/jni/CommandHistory.hxx
scilab/modules/localization/src/jni/setdefaultlanguage_wrap.c
scilab/modules/preferences/src/jni/ScilabPreferences.cpp
scilab/modules/preferences/src/jni/ScilabPreferences.hxx
scilab/modules/renderer/src/jni/CallRenderer.cpp
scilab/modules/renderer/src/jni/CallRenderer.hxx
scilab/modules/renderer/src/jni/XlFontManager.cpp
scilab/modules/renderer/src/jni/XlFontManager.hxx
scilab/modules/scicos_blocks/src/jni/AfficheBlock.cpp
scilab/modules/scicos_blocks/src/jni/AfficheBlock.hxx
scilab/modules/scinotes/src/jni/SciNotes.cpp
scilab/modules/scinotes/src/jni/SciNotes.hxx
scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvas.java
scilab/modules/types/src/jni/ScilabVariables.cpp
scilab/modules/types/src/jni/ScilabVariables.hxx
scilab/modules/types/src/jni/ScilabVariablesRefresh.cpp
scilab/modules/types/src/jni/ScilabVariablesRefresh.hxx
scilab/modules/types/src/jni/getScilabVariable_wrap.c
scilab/modules/ui_data/src/jni/BrowseVar.cpp
scilab/modules/ui_data/src/jni/BrowseVar.hxx
scilab/modules/ui_data/src/jni/EditVar.cpp
scilab/modules/ui_data/src/jni/EditVar.hxx
scilab/modules/ui_data/src/jni/FileBrowser.cpp
scilab/modules/ui_data/src/jni/FileBrowser.hxx
scilab/modules/xcos/src/jni/Modelica.cpp
scilab/modules/xcos/src/jni/Modelica.hxx
scilab/modules/xcos/src/jni/Palette.cpp
scilab/modules/xcos/src/jni/Palette.hxx
scilab/modules/xcos/src/jni/Xcos.cpp
scilab/modules/xcos/src/jni/Xcos.hxx