Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Mon, 11 Dec 2017 08:24:37 +0000 (19:24 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 11 Dec 2017 08:24:37 +0000 (19:24 +1100)
commit4737b95b6519bc1b66a812bab73d4664b3098261
tree4249335ad0aabf2d5e28c92f990f8ddc8428a47c
parenta2f223101490fceea2fa5d58acb4165c6d2d7bc1
parentdd4e0cd3e30a88657981064c3f8fcd81612d9394
Merge branch 'master' into blender2.8
build_files/cmake/platform/platform_win32.cmake