projects
/
blender-staging.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
5a3c6cc
bf5a653
)
svn merge -r39930:39947 https://svn.blender.org/svnroot/bf-blender/trunk/blender
author
Campbell Barton <ideasman42@gmail.com>
Tue, 6 Sep 2011 00:31:00 +0000
(
00:31
+0000)
committer
Campbell Barton <ideasman42@gmail.com>
Tue, 6 Sep 2011 00:31:00 +0000
(
00:31
+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/makesrna/RNA_access.h
patch
|
diff1
|
diff2
|
blob
|
history
source/blender/modifiers/CMakeLists.txt
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/makesrna/RNA_access.h
Simple merge
diff --cc
source/blender/modifiers/CMakeLists.txt
Simple merge
projects / blender-staging.git / commitdiff