Merge branch 'palette-browser' into 'master' 39/18839/1
authorPaul Bignier <paul.bignier@scilab-enterprises.com>
Wed, 4 Jan 2017 16:44:47 +0000 (17:44 +0100)
committerPaul Bignier <paul.bignier@scilab-enterprises.com>
Wed, 4 Jan 2017 16:44:47 +0000 (17:44 +0100)
commiteb38570cae7455aec85cdea43e41188f882d6b36
treeec1ae5eb462e28b26965b556ab44e8f5656494d5
parent173cd84481114f86c4e0ba84b1947b1d9240908e
parent794ca81d66f5bccca16aaff8b75ed5fc048e18a4
Merge branch 'palette-browser' into 'master'

Change-Id: Ib2b127d8fdca5aaf9f2a8e55aeefce61f91594df
25 files changed:
git_hooks/pre-commit
scilab/CHANGES.md
scilab/build.qa.incl.xml
scilab/configure
scilab/modules/api_scilab/Makefile.in
scilab/modules/functions/Makefile.in
scilab/modules/graphics/Makefile.in
scilab/modules/gui/Makefile.in
scilab/modules/history_browser/Makefile.in
scilab/modules/io/Makefile.in
scilab/modules/jvm/Makefile.in
scilab/modules/mpi/Makefile.in
scilab/modules/polynomials/Makefile.in
scilab/modules/randlib/Makefile.in
scilab/modules/scicos/Makefile.in
scilab/modules/tclsci/Makefile.in
scilab/modules/ui_data/Makefile.in
scilab/modules/xcos/Makefile.in
scilab/modules/xcos/etc/palettes.xml
scilab/modules/xcos/src/java/org/scilab/modules/xcos/graph/XcosDiagram.java
scilab/modules/xcos/src/java/org/scilab/modules/xcos/palette/PaletteBlockCtrl.java
scilab/modules/xcos/src/java/org/scilab/modules/xcos/palette/PaletteCtrl.java
scilab/modules/xcos/src/java/org/scilab/modules/xcos/palette/view/PaletteManagerPanel.java
scilab/modules/xcos/src/java/org/scilab/modules/xcos/utils/BlockPositioning.java
scilab/modules/xcos/src/java/org/scilab/modules/xcos/utils/XcosMessages.java