Merging trunk up to r38932.
authorJoerg Mueller <nexyon@gmail.com>
Tue, 2 Aug 2011 12:16:06 +0000 (12:16 +0000)
committerJoerg Mueller <nexyon@gmail.com>
Tue, 2 Aug 2011 12:16:06 +0000 (12:16 +0000)
14 files changed:
1  2 
doc/python_api/rst/bge.types.rst
release/scripts/startup/bl_ui/space_userpref.py
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/intern/key.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/interface/interface_anim.c
source/blender/editors/interface/resources.c
source/blender/editors/object/object_relations.c
source/blender/editors/transform/transform.c
source/blender/editors/transform/transform_ops.c
source/blender/makesdna/DNA_userdef_types.h
source/blender/makesrna/intern/rna_ID.c
source/blender/makesrna/intern/rna_action.c
source/blender/makesrna/intern/rna_userdef.c

Simple merge