Merging r37732 through r37862 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Mon, 27 Jun 2011 14:20:48 +0000 (14:20 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Mon, 27 Jun 2011 14:20:48 +0000 (14:20 +0000)
1  2 
CMakeLists.txt
intern/itasc/ConstraintSet.cpp
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/CMakeLists.txt
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/makesrna/intern/CMakeLists.txt
source/blender/makesrna/intern/makesrna.c
source/blender/makesrna/intern/rna_ID.c
source/blender/makesrna/intern/rna_space.c
source/blender/makesrna/intern/rna_userdef.c

diff --cc CMakeLists.txt
Simple merge
Simple merge