Merge branch 'master' of git://git.scilab.org/scilab into palette-browser 80/18380/1
Marcos CARDINOT [Thu, 21 Jul 2016 20:42:59 +0000 (21:42 +0100)]
Change-Id: Ib8680b7ff5e3fb68bfc9f34baa839a8f234098f1

1  2 
scilab/Makefile.in
scilab/modules/external_objects_java/Makefile.in
scilab/modules/scicos/Makefile.in
scilab/modules/xcos/Makefile.in
scilab/modules/xcos/src/java/org/scilab/modules/xcos/graph/XcosDiagram.java

Simple merge
Simple merge
Simple merge