modified
Merge branch 'master' of https://github.com/ganzziani/xscopes-qt
added more controls
added more controls
added more controls