Merge remote-tracking branch 'origin/5.5'

diff --cc scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/editbox/SwingScilabEditBox.java
Simple merge
diff --cc scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/slider/SwingScilabSlider.java
Simple merge
		1	2
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/editbox/SwingScilabEditBox.java	patch \|	diff1 \|	diff2 \|	blob \| history
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/slider/SwingScilabSlider.java	patch \|	diff1 \|	diff2 \|	blob \| history