Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Fri, 16 Jun 2017 08:26:37 +0000 (10:26 +0200)
committerSergey Sharybin <sergey.vfx@gmail.com>
Fri, 16 Jun 2017 08:26:37 +0000 (10:26 +0200)
1  2 
CMakeLists.txt
doc/python_api/sphinx_doc_gen.py

diff --cc CMakeLists.txt
Simple merge
Simple merge