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)
commit70eb9e85c538e00c4092c595c4b062b7a7560254
tree1629339f2d39f7ce923c6f6a62b70e2e1c368c71
parent5211a685e3529cafa5c6628ffc999addae0035af
parent49f84ef9ed6a2c86552c3727e08a8a5074cc3775
Merging r37732 through r37862 from trunk into soc-2011-tomato
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