Merge branch 'master' into gltf_o3dgc
authorAlexandr Arutjunov <smal.root@gmail.com>
Sat, 10 Sep 2016 07:37:32 +0000 (10:37 +0300)
committerAlexandr Arutjunov <smal.root@gmail.com>
Sat, 10 Sep 2016 07:37:32 +0000 (10:37 +0300)
1  2 
code/CMakeLists.txt

Simple merge