Merge remote-tracking branch 'origin/5.5' 56/16456/1
authorVincent COUVERT <vincent.couvert@scilab-enterprises.com>
Thu, 7 May 2015 08:06:03 +0000 (10:06 +0200)
committerVincent COUVERT <vincent.couvert@scilab-enterprises.com>
Thu, 7 May 2015 08:10:56 +0000 (10:10 +0200)
commitee6e4f420115ee206a75c41382970daf89f71f78
tree06dc568d03b87c9a0c6171e510f81817d268ad88
parenta32a2fae2fe6a76e0181ebb42fcca2879ed42c53
parent2103082c9346eb2927b4093281438449a50a542b
Merge remote-tracking branch 'origin/5.5'

Change-Id: I1ff3668b0dc4b4bbb7a4cdb8e6995c3f9269914d
scilab/configure
scilab/configure.ac
scilab/modules/gui/src/java/org/scilab/modules/gui/SwingView.java
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/frame/SwingScilabScrollableFrame.java