projects / blender.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1e35f4d 1be265a)
Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Wed, 5 Sep 2018 04:48:18 +0000 (14:48 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 5 Sep 2018 04:48:18 +0000 (14:48 +1000)

Trivial merge
The official Blender Foundation tree