Merge with trunk r39062
authorMiika Hamalainen <blender@miikah.org>
Fri, 5 Aug 2011 09:39:49 +0000 (09:39 +0000)
committerMiika Hamalainen <blender@miikah.org>
Fri, 5 Aug 2011 09:39:49 +0000 (09:39 +0000)
commit88243d5167d2a615c434e3e23fcbfbbea6774fbc
tree7d85c09a28c98a600cdb769a05254ec510090023
parent5467df14cac09a05081db0aa2166306e0f35cbe4
parentad7ea2f89205dd67b84ec76d70352ad56004293a
Merge with trunk r39062
source/blender/blenloader/intern/readfile.c
source/blender/makesdna/DNA_space_types.h