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)
1  2 
CMakeLists.txt
source/blender/makesdna/DNA_space_types.h
source/blender/makesrna/intern/rna_space.c

diff --cc CMakeLists.txt
Simple merge