Skip to content
GitLab
Explore
Sign in
Instrument Control
VISA-Releases
NomadGUI
Repository
nomadgui-release
conf
client
logging.properties
Find file
Blame
History
Permalink
Merge branch 'master' into dev
· 12ebbd71
Locatelli
authored
Aug 03, 2020
# Conflicts: # ploty2/lib/libploty2.so # ploty2/lib/libploty2.so.0 # ploty2/lib/libploty2.so.0.0.0
12ebbd71