Merge with trunk revision 37149.
authorJoerg Mueller <nexyon@gmail.com>
Fri, 3 Jun 2011 23:24:01 +0000 (23:24 +0000)
committerJoerg Mueller <nexyon@gmail.com>
Fri, 3 Jun 2011 23:24:01 +0000 (23:24 +0000)
commitcd04cff1800e8f60a06d8da6e79ac436808c9a7d
tree8c6aa631dab983e845ff8626725537d8b71dc9e4
parent71419c46471586e93884aa151f5b160863025886
parentd84c6a3cdb60c4e31db75efc4c6f9a3ea9e9f034
Merge with trunk revision 37149.
release/scripts/startup/bl_ui/space_view3d.py
source/blender/collada/CMakeLists.txt
source/blender/makesrna/intern/rna_actuator.c
source/blender/makesrna/intern/rna_armature.c
source/blender/makesrna/intern/rna_constraint.c
source/blender/makesrna/intern/rna_fcurve.c
source/gameengine/Ketsji/CMakeLists.txt