projects
/
blender.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
de9e45a
6d73e2d
)
Merge branch 'master' into blender2.8
author
Campbell Barton <ideasman42@gmail.com>
Sat, 29 Apr 2017 06:32:25 +0000
(16:32 +1000)
committer
Campbell Barton <ideasman42@gmail.com>
Sat, 29 Apr 2017 06:32:30 +0000
(16:32 +1000)
1
2
source/blender/editors/interface/interface_handlers.c
patch
|
diff1
|
diff2
|
blob
|
history
source/blender/editors/render/render_opengl.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
source/blender/editors/interface/interface_handlers.c
Simple merge
diff --cc
source/blender/editors/render/render_opengl.c
Simple merge
projects / blender.git / commitdiff