projects
/
blender.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
24a64cb
4d38932
)
Merge remote-tracking branch 'origin/master' into blender2.8
author
Dalai Felinto <dfelinto@gmail.com>
Tue, 9 May 2017 15:56:16 +0000
(17:56 +0200)
committer
Dalai Felinto <dfelinto@gmail.com>
Tue, 9 May 2017 15:56:16 +0000
(17:56 +0200)
1
2
intern/cycles/blender/addon/properties.py
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
intern/cycles/blender/addon/properties.py
Simple merge
projects / blender.git / commitdiff