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)
commit8abb8f5e76bd8d723aff8078934ee30e59fa117a
treeea452a47e2cf4726eb5c34cffcb2e1a68f9c9265
parent62fdf815a849e717c8955e948c17fa81ec1b9ab4
parent3b358e91223a2824954c4843fbe8cc45c71c516e
Merge branch 'ldionne-ldionne-cmake' into dev
CMakeLists.txt