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)
commitfdc59b8a40014c28e033f39cbf144565568d7058
treef0acaba90be9c2b0fac9b70e2010479fd8f02c51
parent9ae663154fd9f100c299afaab05a560b1a2a55a4
parent3ee2cb9cdb647729a1d62d2b2dab45813d938cc8
Merge with trunk r38042
source/blender/makesdna/DNA_space_types.h
source/blender/makesrna/intern/rna_space.c
source/blenderplayer/bad_level_call_stubs/stubs.c