Skip to content
  • Locatelli's avatar
    Merge remote-tracking branch 'origin/V3.3' into ploty2 · b7ea1a2b
    Locatelli authored
    Conflicts:
    	ChangeLog
    	conf/client/clientMessages.properties
    	conf/client/config.properties
    	lib/nomadgui-gtk.linux.x86.jar
    	lib64/nomadgui-gtk.linux.x86_64.jar
    	pom.xml
    	src/main/java/fr/ill/ics/client/control/plugin/command/ControllerCommandPlugin.java
    	src/main/java/fr/ill/ics/client/control/plugin/settingstate/SettingsState.java
    	src/main/java/fr/ill/ics/client/view/pluginpeer/setup/swt/SWTNewSettingsControllerSetupPluginPeer.java
    	src/main/java/fr/ill/ics/client/view/widget/swt/SWTPText.java
    b7ea1a2b