Merge branch 'master' of git://git.scilab.org/scilab into palette-browser 80/18380/1
authorMarcos CARDINOT <mcardinot@gmail.com>
Thu, 21 Jul 2016 20:42:59 +0000 (21:42 +0100)
committerMarcos CARDINOT <mcardinot@gmail.com>
Thu, 21 Jul 2016 21:28:06 +0000 (22:28 +0100)
commit1532de017e0633d8a9329348cc1b533093ed8a66
treeda66069598dfcc8f6f8d4b1a4bdd6cdcd71c8adb
parent4cc7f7ab8e12c377b43ea5a1825ca39ededcab58
parent022f1b04de2667426c7725f67b9282c60f1ab953
Merge branch 'master' of git://git.scilab.org/scilab into palette-browser

Change-Id: Ib8680b7ff5e3fb68bfc9f34baa839a8f234098f1
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