Merge branch 'master' into blender2.8
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Mon, 23 Jul 2018 12:23:21 +0000 (14:23 +0200)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Mon, 23 Jul 2018 12:23:21 +0000 (14:23 +0200)
1  2 
CMakeLists.txt

diff --cc CMakeLists.txt
Simple merge