Merge from 2.5 r21112 through r21160
authorArystanbek Dyussenov <arystan.d@gmail.com>
Fri, 26 Jun 2009 13:00:23 +0000 (13:00 +0000)
committerArystanbek Dyussenov <arystan.d@gmail.com>
Fri, 26 Jun 2009 13:00:23 +0000 (13:00 +0000)
commit83a5a585e48ce9abb39e67372bd1ff400877d178
tree44c813b5fc28a68f063f522c4b45abeac6b84b27
parentacb590e4b065505117a78786e2627c43e65c499a
parent4b914c7f75faa65a7d2a991b7904c18051d13a13
Merge from 2.5 r21112 through r21160
source/blender/makesrna/intern/rna_internal.h
source/blender/makesrna/intern/rna_object.c