Merge remote-tracking branch 'origin/master' into gsoc2012-interactions 40/10440/1
authorSylvestre Ledru <sylvestre.ledru@scilab-enterprises.com>
Sat, 9 Feb 2013 09:48:13 +0000 (10:48 +0100)
committerSylvestre Ledru <sylvestre.ledru@scilab-enterprises.com>
Sat, 9 Feb 2013 09:48:13 +0000 (10:48 +0100)
commit99b27c9824a00a7a71c1a69671c2a625f3ff678c
tree02be6b34fbfd0229546619f964994e224b79f08a
parent014803aeafe330e3f711c1e0061489eb908b98ca
parent33ce744497d1c50c731c9f6320bb7cb7a97d3711
Merge remote-tracking branch 'origin/master' into gsoc2012-interactions

Conflicts:
scilab/CHANGES_5.5.X
scilab/modules/graphic_objects/Makefile.in
scilab/modules/gui/src/java/org/scilab/modules/gui/events/GlobalEventWatcher.java
scilab/modules/gui/src/java/org/scilab/modules/gui/events/GlobalMouseEventWatcher.java
scilab/modules/renderer/src/java/org/scilab/modules/renderer/JoGLView/DrawerVisitor.java

Change-Id: I42d3441c85e14c5a905261edd185c24c70de613c
14 files changed:
scilab/CHANGES_5.5.X
scilab/modules/api_scilab/locales/pt_BR.po
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/c/graphic_objects.vcxproj.filters
scilab/modules/graphics/Makefile.in
scilab/modules/gui/Makefile.in
scilab/modules/gui/src/java/org/scilab/modules/gui/events/GlobalEventWatcher.java
scilab/modules/gui/src/java/org/scilab/modules/gui/events/GlobalMouseEventWatcher.java
scilab/modules/gui/src/java/org/scilab/modules/gui/events/callback/CommonCallBack.java
scilab/modules/gui/src/java/org/scilab/modules/gui/utils/ScilabPrintStream.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