projects
/
blender-staging.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
f20de08
a6bb0f9
)
Merging r38220 through r38236 from trunk into soc-2011-tomato
author
Sergey Sharybin <sergey.vfx@gmail.com>
Fri, 8 Jul 2011 17:40:29 +0000
(17:40 +0000)
committer
Sergey Sharybin <sergey.vfx@gmail.com>
Fri, 8 Jul 2011 17:40:29 +0000
(17:40 +0000)
1
2
source/blender/blenloader/intern/readfile.c
patch
|
diff1
|
diff2
|
blob
|
history
source/blender/blenloader/intern/writefile.c
patch
|
diff1
|
diff2
|
blob
|
history
source/blender/editors/transform/transform_conversions.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
source/blender/blenloader/intern/readfile.c
Simple merge
diff --cc
source/blender/blenloader/intern/writefile.c
Simple merge
diff --cc
source/blender/editors/transform/transform_conversions.c
Simple merge
projects / blender-staging.git / commitdiff