Merge remote-tracking branch 'origin/master' into gsoc2012-interactions 42/12042/1
authorVincent COUVERT <vincent.couvert@scilab-enterprises.com>
Tue, 16 Jul 2013 13:38:14 +0000 (15:38 +0200)
committerVincent COUVERT <vincent.couvert@scilab-enterprises.com>
Tue, 16 Jul 2013 13:38:14 +0000 (15:38 +0200)
commitd445313722af00a0fa53a4be44707934b491f781
tree5600107f681648fe5707c1dede269bc8773fa5cf
parentb15977b08ebafcca528a62d4234a7941d92600b8
parent4588c1e3262f1165e5b0cd923509c765adafe6ec
Merge remote-tracking branch 'origin/master' into gsoc2012-interactions

Conflicts:
scilab/CHANGES_5.5.X
scilab/modules/api_scilab/locales/pt_BR.po
scilab/modules/arnoldi/locales/pt_BR.po
scilab/modules/fileio/macros/%_listvarinfile.sci
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/contouredObject/Mark.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/figure/ColorMap.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/graphicObject/GraphicObject.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/legend/Legend.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/polyline/Polyline.java
scilab/modules/graphics/macros/%h_load.sci
scilab/modules/graphics/macros/%h_p.sci
scilab/modules/graphics/macros/%h_save.sci
scilab/modules/graphics/macros/datatips/datatipCreate.sci
scilab/modules/graphics/macros/datatips/datatipRemove.sci
scilab/modules/graphics/macros/datatips/datatipRemoveAll.sci
scilab/modules/graphics/macros/datatips/datatipSetInterp.sci
scilab/modules/graphics/macros/datatips/datatipSetOrientation.sci
scilab/modules/gui/etc/graphics_menubar.xml
scilab/modules/gui/etc/graphics_toolbar.xml
scilab/modules/gui/locales/pt_BR.po
scilab/modules/gui/sci_gateway/c/gw_gui.c
scilab/modules/gui/sci_gateway/gui_gateway.xml
scilab/modules/gui/src/java/org/scilab/modules/gui/events/GlobalMouseEventWatcher.java
scilab/modules/gui/src/java/org/scilab/modules/gui/filechooser/Juigetfile.java
scilab/modules/gui/src/java/org/scilab/modules/gui/utils/ImageExportRenderer.java
scilab/modules/io/macros/%_save.sci
scilab/modules/io/macros/%_sodload.sci
scilab/modules/renderer/src/java/org/scilab/modules/renderer/JoGLView/DrawerVisitor.java
scilab/modules/renderer/src/java/org/scilab/modules/renderer/JoGLView/axes/ruler/UserDefineGraduation.java
scilab/modules/signal_processing/locales/pt_BR.po
scilab/modules/time/locales/pt_BR.po

Change-Id: I236ccb6cd335e88f7219b72f09097904ef2d4f6c
30 files changed:
scilab/modules/graphic_objects/Makefile.am
scilab/modules/graphic_objects/Makefile.in
scilab/modules/graphic_objects/src/c/graphic_objects.vcxproj
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/legend/Legend.java
scilab/modules/graphics/Makefile.am
scilab/modules/graphics/Makefile.in
scilab/modules/graphics/graphics.vcxproj
scilab/modules/graphics/graphics.vcxproj.filters
scilab/modules/graphics/macros/%h_p.sci
scilab/modules/graphics/macros/datatips/datatipSetOrientation.sci
scilab/modules/gui/Makefile.am
scilab/modules/gui/Makefile.in
scilab/modules/gui/etc/graphics_menubar.xml
scilab/modules/gui/etc/graphics_toolbar.xml
scilab/modules/gui/src/c/gui.vcxproj
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/tab/SwingScilabTab.java
scilab/modules/gui/src/java/org/scilab/modules/gui/events/ScilabEventListener.java
scilab/modules/io/macros/%_save.sci
scilab/modules/io/macros/%_sodload.sci
scilab/modules/renderer/src/java/org/scilab/modules/renderer/CallRenderer.java
scilab/modules/renderer/src/java/org/scilab/modules/renderer/JoGLView/DrawerVisitor.java
scilab/modules/renderer/src/java/org/scilab/modules/renderer/JoGLView/axes/AxesDrawer.java
scilab/modules/renderer/src/java/org/scilab/modules/renderer/JoGLView/interaction/InteractionManager.java
scilab/modules/renderer/src/java/org/scilab/modules/renderer/JoGLView/legend/LegendDrawer.java
scilab/modules/renderer/src/java/org/scilab/modules/renderer/JoGLView/text/TextManager.java
scilab/modules/scicos/src/modelica_compiler/compilation.mli
scilab/modules/scicos/src/modelica_compiler/graphNodeSet.mli
scilab/modules/scicos/src/modelica_compiler/scicosCodeGeneration.mli
scilab/modules/scicos/src/modelica_compiler/xMLCodeGeneration.mli
scilab/modules/ui_data/locales/pt_BR.po