projects
/
blender.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
dc848e9
4a73432
)
Merge branch 'master' into blender2.8
author
Campbell Barton <ideasman42@gmail.com>
Fri, 8 Dec 2017 01:59:51 +0000
(12:59 +1100)
committer
Campbell Barton <ideasman42@gmail.com>
Fri, 8 Dec 2017 01:59:51 +0000
(12:59 +1100)
Trivial merge