projects
/
blender-staging.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
89e390f
b602146
)
svn merge ^/trunk/blender -r42292:42303
author
Campbell Barton <ideasman42@gmail.com>
Thu, 1 Dec 2011 00:34:59 +0000
(
00:34
+0000)
committer
Campbell Barton <ideasman42@gmail.com>
Thu, 1 Dec 2011 00:34:59 +0000
(
00:34
+0000)
1
2
source/blender/blenloader/intern/readfile.c
patch
|
diff1
|
diff2
|
blob
|
history
source/blender/editors/object/object_bake.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
source/blender/blenloader/intern/readfile.c
Simple merge
diff --cc
source/blender/editors/object/object_bake.c
Simple merge
projects / blender-staging.git / commitdiff