Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

NomadGUI
- Activity
- Members

Snippets Groups Projects

5a08aa5c

Commit 5a08aa5c authored 4 years ago by helene ortiz

Downloads
- Plain Diff

Merge branch 'V4.0' of https://code.ill.fr/instrument-control/nomad-gui into V4.0

parents cf352f29 6d0c88c3

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

conf/client/config.properties 1 addition, 1 deletion

conf/client/config.properties
src/main/java/fr/ill/ics/client/control/MainWindow.java 0 additions, 6 deletions

src/main/java/fr/ill/ics/client/control/MainWindow.java
src/main/java/fr/ill/ics/client/control/command/content/SettingsHelper.java 10 additions, 0 deletions

...ll/ics/client/control/command/content/SettingsHelper.java
src/main/java/fr/ill/ics/client/control/startup/Startup.java 1 addition, 1 deletion

src/main/java/fr/ill/ics/client/control/startup/Startup.java
src/main/java/fr/ill/ics/client/view/MainWindowPeer.java 1 addition, 3 deletions

src/main/java/fr/ill/ics/client/view/MainWindowPeer.java
src/main/java/fr/ill/ics/client/view/swt/SWTMainWindowPeer.java 6 additions, 2 deletions

...in/java/fr/ill/ics/client/view/swt/SWTMainWindowPeer.java

with 19 additions and 13 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment