Merge branch 'blender2.7'
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Wed, 13 Feb 2019 13:34:26 +0000 (14:34 +0100)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Wed, 13 Feb 2019 13:34:26 +0000 (14:34 +0100)
1  2 
intern/cycles/device/device.cpp
source/blender/makesrna/intern/makesrna.c

Simple merge