Merge branch 'ldionne-ldionne-cmake' into dev
authorkhizmax <khizmax@gmail.com>
Sat, 19 Aug 2017 08:32:29 +0000 (11:32 +0300)
committerkhizmax <khizmax@gmail.com>
Sat, 19 Aug 2017 08:32:29 +0000 (11:32 +0300)
1  2 
CMakeLists.txt

diff --cc CMakeLists.txt
Simple merge