projects
/
blender.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
c1b310c
92f3658
)
Merge branch 'master' into blender2.8
author
Campbell Barton <ideasman42@gmail.com>
Tue, 24 Apr 2018 06:01:21 +0000
(08:01 +0200)
committer
Campbell Barton <ideasman42@gmail.com>
Tue, 24 Apr 2018 06:01:21 +0000
(08:01 +0200)
Trivial merge