Jamie Newbon 05ab554d09 Merge branch 'master' into v1-issue-6538-systemscope-setting ... # Conflicts: # src/gui/src/AppConfig.cpp		2020-04-01 16:09:45 +01:00
..
cmd	Reverting 9005fe3c, 4d9c196c and f0d7b669. Which reverts static SSL libs	2019-11-04 19:30:22 +00:00
gui	Merge branch 'master' into v1-issue-6538-systemscope-setting	2020-04-01 16:09:45 +01:00
lib	Merge pull request #6435 from vifino/patch-1	2020-01-21 16:19:40 +00:00
test	Build tests again	2020-03-19 19:08:59 +01:00
CMakeLists.txt	Build tests again	2020-03-19 19:08:59 +01:00