projects
/
blender-staging.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
2e12919
2442bcf
)
svn merge ^/trunk/blender -r48604:48638
author
Campbell Barton <ideasman42@gmail.com>
Thu, 5 Jul 2012 11:40:48 +0000
(11:40 +0000)
committer
Campbell Barton <ideasman42@gmail.com>
Thu, 5 Jul 2012 11:40:48 +0000
(11:40 +0000)
1
2
release/scripts/startup/bl_ui/space_image.py
patch
|
diff1
|
diff2
|
blob
|
history
source/blender/makesrna/intern/rna_userdef.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
release/scripts/startup/bl_ui/space_image.py
Simple merge
diff --cc
source/blender/makesrna/intern/rna_userdef.c
Simple merge
projects / blender-staging.git / commitdiff