Merge with trunk r37475.
authorJoerg Mueller <nexyon@gmail.com>
Tue, 14 Jun 2011 12:06:21 +0000 (12:06 +0000)
committerJoerg Mueller <nexyon@gmail.com>
Tue, 14 Jun 2011 12:06:21 +0000 (12:06 +0000)
commit8ff0c2e10720bd6e583a6b133b75e7bdff27a5f8
tree9c7e15d27d1b53af6ee9f428c9db7d855f013807
parent7272bb643c379986c7332a994ce9e576d3b8a748
parent23e2bfed239256994a6daf2ca5a08298e7029681
Merge with trunk r37475.
16 files changed:
release/scripts/startup/bl_ui/properties_object_constraint.py
release/scripts/startup/bl_ui/space_userpref.py
release/scripts/startup/bl_ui/space_view3d.py
source/blender/editors/animation/anim_channels_edit.c
source/blender/editors/animation/anim_markers.c
source/blender/editors/interface/resources.c
source/blender/editors/space_logic/logic_window.c
source/blender/editors/transform/transform.c
source/blender/editors/transform/transform_conversions.c
source/blender/makesdna/DNA_actuator_types.h
source/blender/makesdna/DNA_userdef_types.h
source/blender/makesrna/intern/rna_access.c
source/blender/makesrna/intern/rna_actuator.c
source/blender/makesrna/intern/rna_userdef.c
source/blender/windowmanager/intern/wm_files.c
source/gameengine/Converter/KX_ConvertActuators.cpp