Merge branch 'master' of git://git.scilab.org/scilab into palette-browser 79/18179/1
authorMarcos CARDINOT <mcardinot@gmail.com>
Tue, 24 May 2016 00:34:44 +0000 (01:34 +0100)
committerMarcos CARDINOT <mcardinot@gmail.com>
Tue, 24 May 2016 00:34:44 +0000 (01:34 +0100)
commit131df9076ddf951282491f4dfa829112fa9522a9
treef96f520702bd1f99b923ce1ce76e77055ea0b0fc
parent34f2d8087fd57c209e916bb5195c94b4ee0e094b
parent108342066be2defca638e997766fb8a5bd8b8668
Merge branch 'master' of git://git.scilab.org/scilab into palette-browser

Conflicts:
scilab/modules/xcos/src/java/org/scilab/modules/xcos/palette/PaletteBlockCtrl.java

Change-Id: I0ab1b9787e8d1d41bc3b3de3355b099d16c81b53
scilab/build.qa.incl.xml
scilab/modules/Makefile.in
scilab/modules/console/Makefile.in
scilab/modules/gui/Makefile.in
scilab/modules/slint/Makefile.in
scilab/modules/xcos/Makefile.in
scilab/modules/xcos/src/java/org/scilab/modules/xcos/graph/XcosDiagram.java
scilab/modules/xcos/src/java/org/scilab/modules/xcos/palette/Palette.java
scilab/modules/xcos/src/java/org/scilab/modules/xcos/utils/XcosConstants.java
scilab/modules/xcos/src/java/org/scilab/modules/xcos/utils/XcosMessages.java