Merge branch 'master' into w10-start-logo
authorCamila Ayres <hello@camila.codes>
Fri, 6 Sep 2019 15:02:06 +0000 (17:02 +0200)
committerGitHub <noreply@github.com>
Fri, 6 Sep 2019 15:02:06 +0000 (17:02 +0200)
1  2 
src/gui/CMakeLists.txt

Simple merge