Merge branch 'blender-v2.82-release'
authorCampbell Barton <ideasman42@gmail.com>
Wed, 5 Feb 2020 14:33:23 +0000 (01:33 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 5 Feb 2020 14:33:23 +0000 (01:33 +1100)
1  2 
CMakeLists.txt
build_files/cmake/platform/platform_unix.cmake

diff --cc CMakeLists.txt
Simple merge