projects
/
blender-staging.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
e228849
951c179
)
Merging r42062 through r42159 from trunk into soc-2011-tomato
author
Sergey Sharybin <sergey.vfx@gmail.com>
Fri, 25 Nov 2011 15:32:23 +0000
(15:32 +0000)
committer
Sergey Sharybin <sergey.vfx@gmail.com>
Fri, 25 Nov 2011 15:32:23 +0000
(15:32 +0000)
1
2
source/blender/blenloader/intern/readfile.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
source/blender/blenloader/intern/readfile.c
Simple merge