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)
commita3753440529d9ec4dfc8616baef140b36a16208c
tree30dcc38838c360db46bed4c6d279c8b237e93824
parent7212ad9f0ec062df332655439d3a3c7dc22c2f5c
parent22cfe84cba10caebea61078c16fbb564af9e39dc
Merge branch 'master' into gltf_o3dgc
code/CMakeLists.txt