Merge branch 'V4.0' into configura
Showing
- ChangeLog 359 additions, 1 deletionChangeLog
- Nomad.sh 28 additions, 6 deletionsNomad.sh
- TransferLogs.sh 6 additions, 0 deletionsTransferLogs.sh
- conf/client/clientMessages.properties 33 additions, 3 deletionsconf/client/clientMessages.properties
- conf/client/commandLine.txt 5 additions, 0 deletionsconf/client/commandLine.txt
- conf/client/globalLabels.properties 10 additions, 1 deletionconf/client/globalLabels.properties
- conf/client/menu.xml 2 additions, 1 deletionconf/client/menu.xml
- conf/server/controllers/instrument_setting/instrument_setting.properties 1 addition, 1 deletion...trollers/instrument_setting/instrument_setting.properties
- conf/server/controllersAndFamilies.properties 9 additions, 2 deletionsconf/server/controllersAndFamilies.properties
- docs/PluginCreationSummary.odt 0 additions, 0 deletionsdocs/PluginCreationSummary.odt
- docs/PluginCreationSummary.pdf 0 additions, 0 deletionsdocs/PluginCreationSummary.pdf
- lib/nomadgui-gtk.linux.x86.jar 0 additions, 0 deletionslib/nomadgui-gtk.linux.x86.jar
- lib64/nomadgui-gtk.linux.x86_64.jar 0 additions, 0 deletionslib64/nomadgui-gtk.linux.x86_64.jar
- lib64/nomadmail.jar 0 additions, 0 deletionslib64/nomadmail.jar
- pom.xml 3 additions, 3 deletionspom.xml
- src/main/java/fr/ill/ics/apps/LogsTransfer.java 50 additions, 0 deletionssrc/main/java/fr/ill/ics/apps/LogsTransfer.java
- src/main/java/fr/ill/ics/apps/LogsTransferCaller.java 51 additions, 0 deletionssrc/main/java/fr/ill/ics/apps/LogsTransferCaller.java
- src/main/java/fr/ill/ics/client/control/MainWindow.java 477 additions, 280 deletionssrc/main/java/fr/ill/ics/client/control/MainWindow.java
- src/main/java/fr/ill/ics/client/control/chat/ChatFileManager.java 93 additions, 5 deletions.../java/fr/ill/ics/client/control/chat/ChatFileManager.java
- src/main/java/fr/ill/ics/client/control/command/CommandWindow.java 8 additions, 0 deletions...java/fr/ill/ics/client/control/command/CommandWindow.java
Loading
Please register or sign in to comment