Merge branch 'blender2.7'
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Sun, 27 Jan 2019 19:17:11 +0000 (20:17 +0100)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Sun, 27 Jan 2019 19:17:11 +0000 (20:17 +0100)
1  2 
intern/cycles/app/CMakeLists.txt

Simple merge