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)
commit690478027bd795bdbfa55d77987fec6f83c7d03a
tree8edfce541f4f22db676a80ee14a5944186d75f01
parentd97df138d1ab965a39973366810952979d164665
parentd377cd5db19a2c14a4d7ee7ba9986319d49497fa
Merge branch 'blender2.7'
intern/cycles/app/CMakeLists.txt