Merging r37863 through r3789 form trunk1 into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Tue, 28 Jun 2011 10:06:06 +0000 (10:06 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Tue, 28 Jun 2011 10:06:06 +0000 (10:06 +0000)
commitdef04fa5239d5b00f93a6a4f152d7e0fa2b54538
tree975088816180d44154ec6775a36b372d5c9ea4a5
parent83d59a068040c2bc356582963159eb462570872f
parent57f4844c43c097356c321f6b7efd00646ecd50fc
Merging r37863 through r3789 form trunk1 into soc-2011-tomato
CMakeLists.txt
source/blender/makesdna/DNA_space_types.h
source/blender/makesrna/intern/rna_space.c