Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

NomadGUI
- Activity
- Members

Snippets Groups Projects

0e8711e7

Commit 0e8711e7 authored 4 years ago by helene ortiz

Downloads
- Plain Diff

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

parents 7d69e38c 9f7c54d3

No related branches found

No related tags found

No related merge requests found

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

ChangeLog 2 additions, 0 deletions

ChangeLog
src/main/java/fr/ill/ics/client/control/plugin/ControllerPlugin.java 4 additions, 1 deletion

...va/fr/ill/ics/client/control/plugin/ControllerPlugin.java
src/main/java/fr/ill/ics/client/view/pluginpeer/ControllerPluginPeer.java 4 additions, 0 deletions

.../ill/ics/client/view/pluginpeer/ControllerPluginPeer.java

with 10 additions and 1 deletion

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