projects
/
blender.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
0d9c97d
89ab591
)
Merge branch 'master' into blender2.8
author
Campbell Barton <ideasman42@gmail.com>
Sun, 22 Apr 2018 17:23:02 +0000
(19:23 +0200)
committer
Campbell Barton <ideasman42@gmail.com>
Sun, 22 Apr 2018 17:23:02 +0000
(19:23 +0200)
1
2
source/blender/editors/interface/interface_region_popup.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
source/blender/editors/interface/interface_region_popup.c
Simple merge