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)
1  2 
source/blender/blenloader/intern/readfile.c
source/blender/makesdna/DNA_space_types.h