Merge with trunk r37677
authorJoerg Mueller <nexyon@gmail.com>
Mon, 20 Jun 2011 22:55:18 +0000 (22:55 +0000)
committerJoerg Mueller <nexyon@gmail.com>
Mon, 20 Jun 2011 22:55:18 +0000 (22:55 +0000)
20 files changed:
1  2 
release/scripts/modules/bpy_types.py
release/scripts/startup/bl_operators/nla.py
release/scripts/startup/bl_ui/space_userpref.py
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/intern/action.c
source/blender/blenkernel/intern/constraint.c
source/blender/blenloader/intern/readfile.c
source/blender/collada/AnimationImporter.cpp
source/blender/collada/ArmatureImporter.cpp
source/blender/collada/CMakeLists.txt
source/blender/collada/DocumentImporter.cpp
source/blender/collada/SkinInfo.cpp
source/blender/editors/interface/resources.c
source/blender/editors/space_view3d/drawarmature.c
source/blender/editors/transform/transform_conversions.c
source/blender/makesdna/DNA_userdef_types.h
source/blender/makesrna/RNA_access.h
source/blender/makesrna/intern/rna_access.c
source/blender/makesrna/intern/rna_userdef.c
source/gameengine/Converter/BL_ActionActuator.cpp

Simple merge
Simple merge
Simple merge
Simple merge