Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Thu, 13 Sep 2018 05:39:21 +0000 (15:39 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 13 Sep 2018 05:39:21 +0000 (15:39 +1000)
1  2 
GNUmakefile
doc/python_api/sphinx_doc_gen.sh

diff --cc GNUmakefile
Simple merge
Simple merge