projects
/
blender.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
a6d4ac2
6b86b44
)
Merge branch 'master' into blender2.8
author
Bastien Montagne <montagne29@wanadoo.fr>
Mon, 20 Mar 2017 13:37:44 +0000
(14:37 +0100)
committer
Bastien Montagne <montagne29@wanadoo.fr>
Mon, 20 Mar 2017 13:37:44 +0000
(14:37 +0100)
1
2
intern/cycles/blender/addon/ui.py
patch
|
diff1
|
diff2
|
blob
|
history
release/scripts/startup/bl_ui/space_view3d.py
patch
|
diff1
|
diff2
|
blob
|
history
source/blender/editors/space_view3d/drawarmature.c
patch
|
diff1
|
diff2
|
blob
|
history
source/blender/windowmanager/intern/wm_files.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
intern/cycles/blender/addon/ui.py
Simple merge
diff --cc
release/scripts/startup/bl_ui/space_view3d.py
Simple merge
diff --cc
source/blender/editors/space_view3d/drawarmature.c
Simple merge
diff --cc
source/blender/windowmanager/intern/wm_files.c
Simple merge
projects / blender.git / commitdiff