Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Mon, 4 Dec 2017 05:51:07 +0000 (16:51 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 4 Dec 2017 05:51:07 +0000 (16:51 +1100)
1  2 
CMakeLists.txt

diff --cc CMakeLists.txt
Simple merge