Merge with trunk r38042
authorMiika Hamalainen <blender@miikah.org>
Sat, 2 Jul 2011 18:15:55 +0000 (18:15 +0000)
committerMiika Hamalainen <blender@miikah.org>
Sat, 2 Jul 2011 18:15:55 +0000 (18:15 +0000)
1  2 
source/blender/makesdna/DNA_space_types.h
source/blender/makesrna/intern/rna_space.c
source/blenderplayer/bad_level_call_stubs/stubs.c