Merge remote-tracking branch 'origin/master' into blender2.8
authorRay Molenkamp <github@lazydodo.com>
Mon, 22 Oct 2018 16:19:06 +0000 (10:19 -0600)
committerRay Molenkamp <github@lazydodo.com>
Mon, 22 Oct 2018 16:19:06 +0000 (10:19 -0600)
1  2 
CMakeLists.txt
build_files/cmake/macros.cmake
build_files/cmake/platform/platform_win32.cmake
build_files/windows/parse_arguments.cmd
source/creator/CMakeLists.txt

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