projects
/
blender.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
54a9136
0e0d991
)
Merge branch 'master' into blender2.8
author
Campbell Barton <ideasman42@gmail.com>
Thu, 17 May 2018 17:55:27 +0000
(19:55 +0200)
committer
Campbell Barton <ideasman42@gmail.com>
Thu, 17 May 2018 17:55:27 +0000
(19:55 +0200)
Trivial merge