Merge remote-tracking branch 'origin/5.5' 69/15469/1
authorVincent COUVERT <vincent.couvert@scilab-enterprises.com>
Tue, 4 Nov 2014 13:32:48 +0000 (14:32 +0100)
committerVincent COUVERT <vincent.couvert@scilab-enterprises.com>
Tue, 4 Nov 2014 13:32:48 +0000 (14:32 +0100)
commit598fa419e890ac8fb69248b00d845f3e4f326bab
treefea910a2adebda41bd200a118dee310d5daedd0d
parent9994de2b7a86d2be21c165a4e6f87fb9b80d9140
parent1f55f7961d60a1bfcab02dbdbbaaeb5b6f5f20cb
Merge remote-tracking branch 'origin/5.5'

Conflicts:
scilab/configure

Change-Id: Ief160371c4ff8843faf74162524f0bee912658dd
scilab/configure
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/frame/SwingScilabFrame.java
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/frame/SwingScilabScrollableFrame.java
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/tab/SwingScilabDockablePanel.java
scilab/modules/javasci/Makefile.in