projects
/
blender.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
90788ad
6355d98
)
Merge branch 'master' into blender2.8
author
Campbell Barton <ideasman42@gmail.com>
Thu, 2 Nov 2017 13:31:47 +0000
(
00:31
+1100)
committer
Campbell Barton <ideasman42@gmail.com>
Thu, 2 Nov 2017 13:31:47 +0000
(
00:31
+1100)
1
2
source/blender/editors/include/UI_interface.h
patch
|
diff1
|
diff2
|
blob
|
history
source/blender/editors/interface/interface_intern.h
patch
|
diff1
|
diff2
|
blob
|
history
source/blender/editors/interface/interface_widgets.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
source/blender/editors/include/UI_interface.h
Simple merge
diff --cc
source/blender/editors/interface/interface_intern.h
Simple merge
diff --cc
source/blender/editors/interface/interface_widgets.c
Simple merge
projects / blender.git / commitdiff