projects / blender.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: ab168f6 9623d93)
Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Wed, 26 Apr 2017 08:11:03 +0000 (10:11 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Wed, 26 Apr 2017 08:11:03 +0000 (10:11 +0200)

Trivial merge
The official Blender Foundation tree