Merge remote-tracking branch 'origin/5.5' 53/16153/1
authorVincent COUVERT <vincent.couvert@scilab-enterprises.com>
Fri, 13 Mar 2015 08:25:53 +0000 (09:25 +0100)
committerVincent COUVERT <vincent.couvert@scilab-enterprises.com>
Fri, 13 Mar 2015 08:25:53 +0000 (09:25 +0100)
commita337d144271aa0fc3737071de9dfea3c8fbcc8dc
tree0295463a77411c9ca3b49a581eeece0409bf1298
parenta9a9cd58c4b5c4a0b41f6afdd440c5f1751e4718
parent814e090c1e336aae6a540ec6030c991af0c7b4d6
Merge remote-tracking branch 'origin/5.5'

Conflicts:
scilab/configure

Change-Id: I8c3e51baa048eea94c27b427aa602bd97b7f73dc
scilab/configure
scilab/configure.ac
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/frame/SwingScilabFrame.java
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/label/SwingScilabLabel.java
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/toolbar/SwingScilabToolBar.java
scilab/modules/gui/src/java/org/scilab/modules/gui/toolbar/ScilabToolBar.java
scilab/modules/gui/src/java/org/scilab/modules/gui/toolbar/SimpleToolBar.java