Merge branch 'master' of https://github.com/peterleban/GUI

Araneidae · Jan 25, 2018 · 595b8cb · 595b8cb
2 parents 477caec + 13833c7
commit 595b8cb
Show file tree

Hide file tree

Showing 63 changed files with 13,440 additions and 2,190 deletions.
diff --git a/LiberaCavityBPM/acquisition_settings.ui b/LiberaCavityBPM/acquisition_settings.ui