Merge branch 'master' of https://git.lemmasoftware.org/Merlin
authorT-bone <trevorirons@gmail.com>
Wed, 10 Jan 2018 06:27:11 +0000 (23:27 -0700)
committerT-bone <trevorirons@gmail.com>
Wed, 10 Jan 2018 06:27:11 +0000 (23:27 -0700)
1  2 
CMakeLists.txt

diff --cc CMakeLists.txt
Simple merge