Merge branch 'master' into blender2.8
authorSybren A. Stüvel <sybren@stuvel.eu>
Fri, 21 Apr 2017 14:30:24 +0000 (16:30 +0200)
committerSybren A. Stüvel <sybren@stuvel.eu>
Fri, 21 Apr 2017 14:30:24 +0000 (16:30 +0200)
1  2 
CMakeLists.txt
build_files/cmake/macros.cmake
source/blenderplayer/CMakeLists.txt
tests/python/CMakeLists.txt

diff --cc CMakeLists.txt
Simple merge
Simple merge
Simple merge
Simple merge