Merge branch 'master' into import_amf
authorAlexandr Arutjunov <smal.root@gmail.com>
Wed, 28 Sep 2016 14:51:59 +0000 (17:51 +0300)
committerAlexandr Arutjunov <smal.root@gmail.com>
Wed, 28 Sep 2016 14:51:59 +0000 (17:51 +0300)
commit0a25b076b8968b7ea2aa96d7d1b4381be2d72ce6
treeab4f8d0ecf8b1aaca8ed6458f20d7c7ea3327269
parent9069ea20fa168a4610f9036c52ea885df6aa4ddf
parentf383ec0797986a70af99b5e946119f1b0951baf5
Merge branch 'master' into import_amf
code/CMakeLists.txt