Merge branch 'blender2.7'
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Sun, 17 Feb 2019 14:57:34 +0000 (15:57 +0100)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Sun, 17 Feb 2019 14:57:34 +0000 (15:57 +0100)
commitc5f13ecbc064a3cb2c57492d7c7075e248be5bda
tree18278120919d1443dcc2d04d905bcc6f3e3c7a35
parent319b9d6501f2170dcf06b10de0add340d0be83a3
parent8a97b8555587d8241fd79d54c08c1a6ced7acf53
Merge branch 'blender2.7'
intern/cycles/blender/addon/version_update.py
source/blender/blenlib/intern/system.c
source/blender/makesrna/intern/rna_ID.c