Merge remote-tracking branch 'origin/master' into graphic 40/6740/2
authorVincent COUVERT <vincent.couvert@scilab.org>
Wed, 21 Mar 2012 21:10:03 +0000 (22:10 +0100)
committerVincent Couvert <vincent.couvert@scilab.org>
Thu, 22 Mar 2012 08:40:17 +0000 (09:40 +0100)
commit581e7b4a2d723ec0bcb9d97aeb68aa6246169253
treed3d1c66cb22b8deccd0e7ea66342b51cc952f8fc
parent73be9394b11217b67a4c41c6502c354f9d8431a7
parent94438c7974a28ca4f2c8b78d6ddd4716f4b111dd
Merge remote-tracking branch 'origin/master' into graphic

Conflicts:
scilab/CHANGES_5.4.X
scilab/Scilab.sln
scilab/Scilab_f2c.sln
scilab/configure
scilab/modules/Makefile.in
scilab/modules/core/includes/callinterf.h
scilab/modules/core/src/c/callinterf.c
scilab/modules/core/src/java/org/scilab/modules/core/Scilab.java
scilab/modules/graphic_export/src/c/xs2file.c
scilab/modules/graphics/help/en_US/2d_plot/champ_properties.xml
scilab/modules/graphics/help/en_US/3d_plot/param3d_properties.xml
scilab/modules/graphics/help/en_US/axes_operations/axes_properties.xml
scilab/modules/graphics/help/en_US/geometric_shapes/arc_properties.xml
scilab/modules/graphics/help/en_US/geometric_shapes/rectangle_properties.xml
scilab/modules/graphics/help/en_US/polygon/polyline_properties.xml
scilab/modules/graphics/help/en_US/segs_properties.xml
scilab/modules/graphics/help/en_US/xget.xml
scilab/modules/graphics/help/en_US/xset.xml
scilab/modules/graphics/help/fr_FR/bar_histogram/bar.xml
scilab/modules/graphics/help/fr_FR/bar_histogram/barh.xml
scilab/modules/graphics/help/fr_FR/bar_histogram/barhomogenize.xml
scilab/modules/graphics/help/fr_FR/handle/swap_handles.xml
scilab/modules/graphics/includes/gw_graphics.h
scilab/modules/graphics/macros/contourf.sci
scilab/modules/graphics/sci_gateway/c/gw_graphics.c
scilab/modules/gui/Makefile.am
scilab/modules/gui/Makefile.in
scilab/modules/gui/help/en_US/getcallbackobject.xml
scilab/modules/gui/help/en_US/uicontrol.xml
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/CallScilabBridge.java
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/messagebox/SwingScilabMessageBox.java
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/window/SwingScilabWindow.java
scilab/modules/gui/src/java/org/scilab/modules/gui/utils/WindowsConfigurationManager.java
scilab/modules/gui/src/jni/CallScilabBridge.cpp
scilab/modules/gui/src/jni/CallScilabBridge.hxx
scilab/modules/prebuildjava/build.xml
scilab/modules/renderer/Makefile.am
scilab/modules/renderer/Makefile.in
scilab/modules/renderer/src/jni/ArcFillDrawerGL.cpp
scilab/modules/renderer/src/jni/ArcFillDrawerGL.hxx
scilab/modules/renderer/src/jni/ArcLineDrawerGL.cpp
scilab/modules/renderer/src/jni/ArcLineDrawerGL.hxx
scilab/modules/renderer/src/jni/BackTrihedronDrawerGL.cpp
scilab/modules/renderer/src/jni/BackTrihedronDrawerGL.hxx
scilab/modules/renderer/src/jni/CallRenderer.hxx
scilab/modules/renderer/src/jni/CenteredTextDrawerGL.cpp
scilab/modules/renderer/src/jni/CenteredTextDrawerGL.hxx
scilab/modules/renderer/src/jni/DrawableArcGL.cpp
scilab/modules/renderer/src/jni/DrawableArcGL.hxx
scilab/modules/renderer/src/jni/DrawableAxesGL.cpp
scilab/modules/renderer/src/jni/DrawableAxesGL.hxx
scilab/modules/renderer/src/jni/DrawableFecGL.cpp
scilab/modules/renderer/src/jni/DrawableFecGL.hxx
scilab/modules/renderer/src/jni/DrawableFigureGL.cpp
scilab/modules/renderer/src/jni/DrawableFigureGL.hxx
scilab/modules/renderer/src/jni/DrawableGrayplotGL.cpp
scilab/modules/renderer/src/jni/DrawableGrayplotGL.hxx
scilab/modules/renderer/src/jni/DrawablePolylineGL.cpp
scilab/modules/renderer/src/jni/DrawablePolylineGL.hxx
scilab/modules/renderer/src/jni/DrawableRectangleGL.cpp
scilab/modules/renderer/src/jni/DrawableRectangleGL.hxx
scilab/modules/renderer/src/jni/DrawableSegsGL.cpp
scilab/modules/renderer/src/jni/DrawableSegsGL.hxx
scilab/modules/renderer/src/jni/DrawableSubwinGL.cpp
scilab/modules/renderer/src/jni/DrawableSubwinGL.hxx
scilab/modules/renderer/src/jni/DrawableSurfaceGL.cpp
scilab/modules/renderer/src/jni/DrawableSurfaceGL.hxx
scilab/modules/renderer/src/jni/DrawableTextGL.cpp
scilab/modules/renderer/src/jni/DrawableTextGL.hxx
scilab/modules/renderer/src/jni/FecFacetDrawerGL.cpp
scilab/modules/renderer/src/jni/FecFacetDrawerGL.hxx
scilab/modules/renderer/src/jni/FecLineDrawerGL.cpp
scilab/modules/renderer/src/jni/FilledTextDrawerGL.cpp
scilab/modules/renderer/src/jni/FilledTextDrawerGL.hxx
scilab/modules/renderer/src/jni/FullBoxDrawerGL.cpp
scilab/modules/renderer/src/jni/FullBoxDrawerGL.hxx
scilab/modules/renderer/src/jni/GraphicSynchronizerJava.cpp
scilab/modules/renderer/src/jni/GraphicSynchronizerJava.hxx
scilab/modules/renderer/src/jni/GridDrawerGL.cpp
scilab/modules/renderer/src/jni/GridDrawerGL.hxx
scilab/modules/renderer/src/jni/HalfBoxDrawerGL.cpp
scilab/modules/renderer/src/jni/HalfBoxDrawerGL.hxx
scilab/modules/renderer/src/jni/IsoViewCameraGL.cpp
scilab/modules/renderer/src/jni/IsoViewCameraGL.hxx
scilab/modules/renderer/src/jni/IsometricCameraGL.cpp
scilab/modules/renderer/src/jni/IsometricCameraGL.hxx
scilab/modules/renderer/src/jni/PolylineArrowDrawerGL.cpp
scilab/modules/renderer/src/jni/PolylineArrowDrawerGL.hxx
scilab/modules/renderer/src/jni/PolylineBarDrawerGL.cpp
scilab/modules/renderer/src/jni/PolylineBarDrawerGL.hxx
scilab/modules/renderer/src/jni/PolylineFillDrawerGL.cpp
scilab/modules/renderer/src/jni/PolylineFillDrawerGL.hxx
scilab/modules/renderer/src/jni/PolylineInterpColorDrawerGL.cpp
scilab/modules/renderer/src/jni/PolylineInterpColorDrawerGL.hxx
scilab/modules/renderer/src/jni/PolylineLineDrawerGL.cpp
scilab/modules/renderer/src/jni/PolylineLineDrawerGL.hxx
scilab/modules/renderer/src/jni/PolylineMarkDrawerGL.cpp
scilab/modules/renderer/src/jni/PolylineMarkDrawerGL.hxx
scilab/modules/renderer/src/jni/RectangleFillDrawerGL.cpp
scilab/modules/renderer/src/jni/RectangleFillDrawerGL.hxx
scilab/modules/renderer/src/jni/RectangleLineDrawerGL.cpp
scilab/modules/renderer/src/jni/RectangleLineDrawerGL.hxx
scilab/modules/renderer/src/jni/RectangleMarkDrawerGL.cpp
scilab/modules/renderer/src/jni/RectangleMarkDrawerGL.hxx
scilab/modules/renderer/src/jni/RenderingChecker.cpp
scilab/modules/renderer/src/jni/RenderingChecker.hxx
scilab/modules/renderer/src/jni/SegsArrowDrawerGL.cpp
scilab/modules/renderer/src/jni/SegsArrowDrawerGL.hxx
scilab/modules/renderer/src/jni/SegsLineDrawerGL.cpp
scilab/modules/renderer/src/jni/SegsLineDrawerGL.hxx
scilab/modules/renderer/src/jni/SegsMarkDrawerGL.cpp
scilab/modules/renderer/src/jni/SegsMarkDrawerGL.hxx
scilab/modules/renderer/src/jni/StandardTextDrawerGL.cpp
scilab/modules/renderer/src/jni/StandardTextDrawerGL.hxx
scilab/modules/renderer/src/jni/SubwinBackgroundDrawerGL.cpp
scilab/modules/renderer/src/jni/SubwinBackgroundDrawerGL.hxx
scilab/modules/renderer/src/jni/SurfaceFacetDrawerGL.cpp
scilab/modules/renderer/src/jni/SurfaceFacetDrawerGL.hxx
scilab/modules/renderer/src/jni/SurfaceLineDrawerGL.cpp
scilab/modules/renderer/src/jni/SurfaceLineDrawerGL.hxx
scilab/modules/renderer/src/jni/SurfaceMarkDrawerGL.cpp
scilab/modules/renderer/src/jni/SurfaceMarkDrawerGL.hxx
scilab/modules/renderer/src/jni/TicksDrawerGL.cpp
scilab/modules/renderer/src/jni/TicksDrawerGL.hxx
scilab/modules/scicos_blocks/includes/scoBase.h
scilab/modules/scicos_blocks/includes/scoGetProperty.h
scilab/modules/scicos_blocks/includes/scoMemoryScope.h
scilab/modules/scicos_blocks/includes/scoMisc.h
scilab/modules/scicos_blocks/includes/scoSetProperty.h
scilab/modules/scicos_blocks/includes/scoWindowScope.h
scilab/modules/scicos_blocks/src/c/bouncexy.c
scilab/modules/scicos_blocks/src/c/canimxy.c
scilab/modules/scicos_blocks/src/c/canimxy3d.c
scilab/modules/scicos_blocks/src/c/cevscpe.c
scilab/modules/scicos_blocks/src/c/cfscope.c
scilab/modules/scicos_blocks/src/c/cmat3d.c
scilab/modules/scicos_blocks/src/c/cmatview.c
scilab/modules/scicos_blocks/src/c/cmscope.c
scilab/modules/scicos_blocks/src/c/cscope.c
scilab/modules/scicos_blocks/src/c/cscopxy.c
scilab/modules/scicos_blocks/src/c/cscopxy3d.c
scilab/modules/scicos_blocks/src/c/scoGetProperty.c
scilab/modules/scicos_blocks/src/c/scoMemoryScope.c
scilab/modules/scicos_blocks/src/c/scoMisc.c
scilab/modules/scicos_blocks/src/c/scoSetProperty.c
scilab/modules/scicos_blocks/src/c/scoWindowScope.c
scilab/modules/types/src/java/org/scilab/modules/types/ScilabBooleanSparse.java
scilab/modules/types/src/java/org/scilab/modules/types/ScilabSparse.java
scilab/modules/xcos/src/java/org/scilab/modules/xcos/XcosTab.java
scilab/scilab-lib.properties.vc

Change-Id: I40ddaeba45e0f1e747c434981e1aba5772dbcc30
169 files changed:
scilab/CHANGES_5.4.X
scilab/Makefile.in
scilab/Scilab.sln
scilab/Scilab_f2c.sln
scilab/build.incl.xml
scilab/configure
scilab/configure.ac
scilab/contrib/Makefile.in
scilab/desktop/Makefile.in
scilab/desktop/images/icons/Makefile.in
scilab/etc/classpath.xml.in
scilab/etc/classpath.xml.vc
scilab/etc/librarypath.xml
scilab/etc/modules.xml.in
scilab/etc/modules.xml.vc
scilab/libs/MALLOC/Makefile.in
scilab/libs/Makefile.in
scilab/libs/doublylinkedlist/Makefile.in
scilab/libs/dynamiclibrary/Makefile.in
scilab/libs/hashtable/Makefile.in
scilab/libs/libst/Makefile.in
scilab/modules/Makefile.am
scilab/modules/Makefile.in
scilab/modules/action_binding/Makefile.in
scilab/modules/api_scilab/Makefile.in
scilab/modules/arnoldi/Makefile.in
scilab/modules/atoms/Makefile.in
scilab/modules/boolean/Makefile.in
scilab/modules/cacsd/Makefile.in
scilab/modules/call_scilab/Makefile.in
scilab/modules/call_scilab/src/c/call_scilab.c
scilab/modules/commons/Makefile.in
scilab/modules/compatibility_functions/Makefile.in
scilab/modules/completion/Makefile.in
scilab/modules/console/Makefile.in
scilab/modules/core/Makefile.in
scilab/modules/core/includes/callinterf.h
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/core/src/java/org/scilab/modules/core/Scilab.java
scilab/modules/data_structures/Makefile.in
scilab/modules/demo_tools/Makefile.in
scilab/modules/development_tools/Makefile.in
scilab/modules/development_tools/src/fake/Makefile.in
scilab/modules/differential_equations/Makefile.in
scilab/modules/double/Makefile.in
scilab/modules/dynamic_link/Makefile.in
scilab/modules/elementary_functions/Makefile.in
scilab/modules/fftw/Makefile.in
scilab/modules/fileio/Makefile.in
scilab/modules/functions/Makefile.in
scilab/modules/genetic_algorithms/Makefile.in
scilab/modules/graph/Makefile.in
scilab/modules/graph/src/java/org/scilab/modules/graph/ScilabGraph.java
scilab/modules/graphic_export/Makefile.in
scilab/modules/graphic_export/src/c/xs2file.c
scilab/modules/graphic_objects/Makefile.in
scilab/modules/graphic_objects/src/c/graphic_objects.vcxproj
scilab/modules/graphic_objects/src/jni/CallGraphicController.cpp
scilab/modules/graphic_objects/src/jni/CallGraphicController.hxx
scilab/modules/graphic_objects/src/jni/ScilabNativeView_wrap.c
scilab/modules/graphics/Makefile.in
scilab/modules/graphics/help/en_US/2d_plot/champ_properties.xml
scilab/modules/graphics/help/en_US/3d_plot/param3d_properties.xml
scilab/modules/graphics/help/en_US/axes_operations/axes_properties.xml
scilab/modules/graphics/help/en_US/geometric_shapes/arc_properties.xml
scilab/modules/graphics/help/en_US/geometric_shapes/rectangle_properties.xml
scilab/modules/graphics/help/en_US/polygon/polyline_properties.xml
scilab/modules/graphics/help/en_US/segs_properties.xml
scilab/modules/graphics/help/en_US/xget.xml
scilab/modules/graphics/help/en_US/xset.xml
scilab/modules/graphics/help/fr_FR/bar_histogram/bar.xml
scilab/modules/graphics/help/fr_FR/bar_histogram/barh.xml
scilab/modules/graphics/help/fr_FR/bar_histogram/barhomogenize.xml
scilab/modules/graphics/help/fr_FR/handle/swap_handles.xml
scilab/modules/graphics/includes/gw_graphics.h
scilab/modules/graphics/locales/graphics.pot
scilab/modules/graphics/macros/contourf.sci
scilab/modules/graphics/sci_gateway/c/gw_graphics.c
scilab/modules/graphics/sci_gateway/c/sci_xget.c
scilab/modules/gui/Makefile.am
scilab/modules/gui/Makefile.in
scilab/modules/gui/etc/main_menubar.xml
scilab/modules/gui/help/en_US/getcallbackobject.xml
scilab/modules/gui/help/en_US/uicontrol.xml
scilab/modules/gui/sci_gateway/cpp/sci_toprint.cpp
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/CallScilabBridge.java
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/messagebox/SwingScilabMessageBox.java
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/window/SwingScilabWindow.java
scilab/modules/gui/src/java/org/scilab/modules/gui/utils/ClosingOperationsManager.java
scilab/modules/gui/src/java/org/scilab/modules/gui/utils/WindowsConfigurationManager.java
scilab/modules/gui/src/jni/CallScilabBridge.cpp
scilab/modules/gui/src/jni/CallScilabBridge.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/hdf5/Makefile.in
scilab/modules/helptools/Makefile.in
scilab/modules/history_browser/Makefile.in
scilab/modules/history_manager/Makefile.in
scilab/modules/integer/Makefile.in
scilab/modules/interpolation/Makefile.in
scilab/modules/intersci/Makefile.in
scilab/modules/io/Makefile.in
scilab/modules/javasci/Javasci.vcxproj
scilab/modules/javasci/Makefile.in
scilab/modules/javasci/src/jni/call_scilab.i
scilab/modules/javasci/src/jni/call_scilab_wrap.c
scilab/modules/jvm/Makefile.in
scilab/modules/linear_algebra/Makefile.in
scilab/modules/localization/Makefile.in
scilab/modules/m2sci/Makefile.in
scilab/modules/matio/Makefile.in
scilab/modules/mexlib/Makefile.in
scilab/modules/modules_manager/Makefile.in
scilab/modules/optimization/Makefile.in
scilab/modules/output_stream/Makefile.in
scilab/modules/overloading/Makefile.in
scilab/modules/parallel/Makefile.in
scilab/modules/parameters/Makefile.in
scilab/modules/polynomials/Makefile.in
scilab/modules/prebuildjava/Makefile.in
scilab/modules/prebuildjava/build.xml
scilab/modules/preferences/Makefile.in
scilab/modules/randlib/Makefile.in
scilab/modules/renderer/Makefile.am
scilab/modules/renderer/Makefile.in
scilab/modules/renderer/src/jni/CallRenderer.cpp
scilab/modules/renderer/src/jni/CallRenderer.hxx
scilab/modules/scicos/Makefile.in
scilab/modules/scicos_blocks/Makefile.in
scilab/modules/scicos_blocks/src/c/bouncexy.c
scilab/modules/scicos_blocks/src/c/canimxy.c
scilab/modules/scicos_blocks/src/c/canimxy3d.c
scilab/modules/scicos_blocks/src/c/cevscpe.c
scilab/modules/scicos_blocks/src/c/cfscope.c
scilab/modules/scicos_blocks/src/c/cmat3d.c
scilab/modules/scicos_blocks/src/c/cmatview.c
scilab/modules/scicos_blocks/src/c/cmscope.c
scilab/modules/scicos_blocks/src/c/cscope.c
scilab/modules/scicos_blocks/src/c/cscopxy.c
scilab/modules/scicos_blocks/src/c/cscopxy3d.c
scilab/modules/scinotes/Makefile.in
scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/SciNotes.java
scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/utils/ConfigSciNotesManager.java
scilab/modules/signal_processing/Makefile.in
scilab/modules/simulated_annealing/Makefile.in
scilab/modules/sound/Makefile.in
scilab/modules/sparse/Makefile.in
scilab/modules/special_functions/Makefile.in
scilab/modules/spreadsheet/Makefile.in
scilab/modules/statistics/Makefile.in
scilab/modules/string/Makefile.in
scilab/modules/symbolic/Makefile.in
scilab/modules/tclsci/Makefile.in
scilab/modules/time/Makefile.in
scilab/modules/types/Makefile.in
scilab/modules/ui_data/Makefile.in
scilab/modules/umfpack/Makefile.in
scilab/modules/windows_tools/Makefile.in
scilab/modules/xcos/Makefile.in
scilab/modules/xcos/src/java/org/scilab/modules/xcos/XcosTab.java
scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/BasicBlock.java
scilab/modules/xcos/src/java/org/scilab/modules/xcos/palette/listener/PaletteManagerMouseListener.java
scilab/modules/xml/Makefile.in
scilab/scilab-lib.properties.in
scilab/scilab-lib.properties.vc