-
Locatelli authored
Conflicts: ChangeLog 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/MainWindow.java src/main/java/fr/ill/ics/client/control/experiment/ExperimentData.java src/main/java/fr/ill/ics/client/control/plugin/selection/CommandsSelectionPlugin.java src/main/java/fr/ill/ics/client/control/plugin/setup/ParameterSurveyControllerSetupPlugin.java src/main/java/fr/ill/ics/client/control/startup/Startup.java src/main/java/fr/ill/ics/client/view/command/content/swt/SWTSettingsCommandBoxPeer.java src/main/java/fr/ill/ics/client/view/widget/SimpleText.java
41fd1a56