Merge branch 'master' into gltf_o3dgc
authorAlexandr Arutjunov <smal.root@gmail.com>
Sun, 14 Aug 2016 13:49:53 +0000 (16:49 +0300)
committerAlexandr Arutjunov <smal.root@gmail.com>
Sun, 14 Aug 2016 13:49:53 +0000 (16:49 +0300)
1  2 
code/CMakeLists.txt

Simple merge