Merge branch 'blender2.7'
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Thu, 24 Jan 2019 14:44:06 +0000 (15:44 +0100)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Thu, 24 Jan 2019 14:44:06 +0000 (15:44 +0100)
commit8be7ed140896e05b33c580f414a282a25738269b
tree2717f0e1f9616531a7866ac6f8ebd4431accf282
parent5fc4214adaaa8d13bc5f2d5d45ee9a814b672e04
parent3a527357a556491406ee9d33a79ab0af5f79e326
Merge branch 'blender2.7'
intern/cycles/blender/addon/properties.py
intern/cycles/blender/addon/version_update.py
source/blender/blenkernel/BKE_blender_version.h