projects
/
blender.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
5a21bc5
4bbccd3
)
svn merge -r 22423:22450 https://svn.blender.org/svnroot/bf-blender/branches/blender2...
author
Matt Ebb <matt@mke3.net>
Sat, 15 Aug 2009 07:40:22 +0000
(07:40 +0000)
committer
Matt Ebb <matt@mke3.net>
Sat, 15 Aug 2009 07:40:22 +0000
(07:40 +0000)
1
2
release/ui/buttons_texture.py
patch
|
diff1
|
diff2
|
blob
|
history
source/blender/makesdna/DNA_texture_types.h
patch
|
diff1
|
diff2
|
blob
|
history
source/blender/makesrna/RNA_access.h
patch
|
diff1
|
diff2
|
blob
|
history
source/blender/makesrna/intern/rna_texture.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
release/ui/buttons_texture.py
Simple merge
diff --cc
source/blender/makesdna/DNA_texture_types.h
Simple merge
diff --cc
source/blender/makesrna/RNA_access.h
Simple merge
diff --cc
source/blender/makesrna/intern/rna_texture.c
Simple merge
projects / blender.git / commitdiff