Merge remote-tracking branch 'origin/master' into gsoc2012-interactions 21/12621/1
authorVincent COUVERT <vincent.couvert@scilab-enterprises.com>
Fri, 20 Sep 2013 12:56:20 +0000 (14:56 +0200)
committerVincent COUVERT <vincent.couvert@scilab-enterprises.com>
Fri, 20 Sep 2013 12:56:20 +0000 (14:56 +0200)
commit40c2287a88a140915f3d0bf86c5d1170b34c5fca
tree9512f6a803329265cfa427fd5809a9588de126b0
parent8962ba4ac02ebbcd8c9538cd28bdee56c16ec83f
parentdcb403fb499069b6848d3ddff9dcfa772986675b
Merge remote-tracking branch 'origin/master' into gsoc2012-interactions

Conflicts:
scilab/modules/graphic_objects/Makefile.am
scilab/modules/graphic_objects/Makefile.in
scilab/modules/graphic_objects/src/c/graphic_objects.vcxproj.filters
scilab/modules/graphic_objects/src/jni/DataLoader_wrap.c
scilab/modules/graphic_objects/src/scripts/propertiesMap.properties
scilab/modules/graphics/Makefile.am
scilab/modules/graphics/Makefile.in
scilab/modules/graphics/help/en_US/datatips/datatipSetDisplay.xml
scilab/modules/graphics/help/en_US/datatips/datatipSetStyle.xml
scilab/modules/graphics/macros/datatips/datatipCreate.sci
scilab/modules/graphics/macros/datatips/datatipRemove.sci
scilab/modules/graphics/macros/datatips/datatipSetInterp.sci
scilab/modules/graphics/macros/datatips/datatipToggle.sci
scilab/modules/graphics/src/c/getHandleProperty/GetHashTable.c
scilab/modules/graphics/src/c/getHandleProperty/SetHashTable.c
scilab/modules/graphics/src/c/getHandleProperty/getHandleProperty.h
scilab/modules/graphics/src/c/getHandleProperty/setHandleProperty.h
scilab/modules/gui/Makefile.am
scilab/modules/gui/Makefile.in
scilab/modules/localization/src/jni/Messages_wrap.c
scilab/modules/types/src/jni/getScilabVariable_wrap.c

Change-Id: Ie23ea5f7b6df188187072fe79570e141c2145fa6
64 files changed:
scilab/modules/core/includes/version.h.in
scilab/modules/core/includes/version.h.vc
scilab/modules/fileio/macros/%_listvarinfile.sci
scilab/modules/graphic_objects/Makefile.am
scilab/modules/graphic_objects/Makefile.in
scilab/modules/graphic_objects/includes/graphicObjectProperties.h
scilab/modules/graphic_objects/src/c/graphic_objects.vcxproj
scilab/modules/graphic_objects/src/c/graphic_objects.vcxproj.filters
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/ObjectData.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/ObjectDataJNI.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/graphicModel/GraphicModel.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/graphicObject/GraphicObjectProperties.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/graphicObject/Visitor.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/legend/Legend.java
scilab/modules/graphic_objects/src/jni/ObjectData_wrap.c
scilab/modules/graphic_objects/src/scripts/propertiesMap.properties
scilab/modules/graphics/Makefile.am
scilab/modules/graphics/Makefile.in
scilab/modules/graphics/graphics.vcxproj
scilab/modules/graphics/graphics.vcxproj.filters
scilab/modules/graphics/help/en_US/datatips/datatipCreate.xml
scilab/modules/graphics/help/en_US/datatips/datatipGetEntities.xml
scilab/modules/graphics/help/en_US/datatips/datatipGetStruct.xml
scilab/modules/graphics/help/en_US/datatips/datatipInitStruct.xml
scilab/modules/graphics/help/en_US/datatips/datatipManagerMode.xml
scilab/modules/graphics/help/en_US/datatips/datatipRedraw.xml
scilab/modules/graphics/help/en_US/datatips/datatipRemove.xml
scilab/modules/graphics/help/en_US/datatips/datatipSetDisplay.xml
scilab/modules/graphics/help/en_US/datatips/datatipSetInterp.xml
scilab/modules/graphics/help/en_US/datatips/datatipSetOrientation.xml
scilab/modules/graphics/help/en_US/datatips/datatipSetStruct.xml
scilab/modules/graphics/help/en_US/datatips/datatipSetStyle.xml
scilab/modules/graphics/help/en_US/datatips/datatips.xml
scilab/modules/graphics/macros/%h_p.sci
scilab/modules/graphics/macros/datatips/datatipGetEntities.sci
scilab/modules/graphics/macros/datatips/datatipRemoveAll.sci
scilab/modules/graphics/macros/datatips/datatipSetOrientation.sci
scilab/modules/graphics/src/c/getHandleProperty/GetHashTable.c
scilab/modules/graphics/src/c/getHandleProperty/SetHashTable.c
scilab/modules/graphics/src/c/getHandleProperty/getHandleProperty.h
scilab/modules/graphics/src/c/getHandleProperty/get_type_property.c
scilab/modules/graphics/src/c/getHandleProperty/setHandleProperty.h
scilab/modules/gui/Makefile.am
scilab/modules/gui/Makefile.in
scilab/modules/gui/includes/gw_gui.h
scilab/modules/gui/sci_gateway/c/gw_gui.c
scilab/modules/gui/sci_gateway/gui_gateway.xml
scilab/modules/gui/src/c/gui.vcxproj
scilab/modules/gui/src/java/org/scilab/modules/gui/SwingView.java
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/javasci/Makefile.in
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/DragZoomRotateInteraction.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/ui_data/locales/pt_BR.po