Merge branch 'blender2.7'
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Fri, 21 Dec 2018 16:05:56 +0000 (17:05 +0100)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Fri, 21 Dec 2018 16:05:56 +0000 (17:05 +0100)
commit275c627b5e642163fc4f02ac256383519ae39394
tree445f110146ec322f8cbf6fed16e3c6910b47779e
parent2ca4f4f0cb8d5d7e0b759fdc5b5a5b7adf7a5817
parent4eeab96f105f12cfbecc305c3f46475b6724470c
Merge branch 'blender2.7'