Merging trunk up to r38329.
authorJoerg Mueller <nexyon@gmail.com>
Tue, 12 Jul 2011 13:09:22 +0000 (13:09 +0000)
committerJoerg Mueller <nexyon@gmail.com>
Tue, 12 Jul 2011 13:09:22 +0000 (13:09 +0000)
1  2 
release/scripts/modules/bpy_types.py
release/scripts/startup/bl_ui/properties_data_armature.py
release/scripts/startup/bl_ui/space_userpref.py
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/intern/depsgraph.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/armature/poseUtils.c
source/blender/editors/transform/transform_conversions.c
source/gameengine/Ketsji/KX_GameObject.cpp

Simple merge