svn merge ^/trunk/blender -r50023:50036
authorCampbell Barton <ideasman42@gmail.com>
Mon, 20 Aug 2012 10:16:22 +0000 (10:16 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 20 Aug 2012 10:16:22 +0000 (10:16 +0000)
commit1920c4ef39895fc09d07a952b3769e4fdff1f097
tree2f9c08e3f199d5829350e709a5187d72f40ec335
parentf81f4427f9c606c6d337d33e7a1552adb383d58d
parent4a6395cc21bca5f5b24ea4c305f24482a0eb2144
svn merge ^/trunk/blender -r50023:50036
CMakeLists.txt
source/blender/makesrna/intern/rna_space.c