Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Fri, 18 May 2018 13:31:53 +0000 (15:31 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 18 May 2018 13:31:53 +0000 (15:31 +0200)
1  2 
CMakeLists.txt

diff --cc CMakeLists.txt
Simple merge