projects / blender.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ed8c71d 0ebe08a)
Merge branch 'master' into 28
authorCampbell Barton <ideasman42@gmail.com>
Wed, 12 Apr 2017 04:23:47 +0000 (14:23 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 12 Apr 2017 04:23:47 +0000 (14:23 +1000)

Trivial merge
The official Blender Foundation tree