Merging trunk up to r39637.
authorJoerg Mueller <nexyon@gmail.com>
Mon, 22 Aug 2011 20:31:46 +0000 (20:31 +0000)
committerJoerg Mueller <nexyon@gmail.com>
Mon, 22 Aug 2011 20:31:46 +0000 (20:31 +0000)
commitf0d5abfcb2b54f6fd7a24220e81e0c88a914d87f
tree328a631d447ea7c7be2a757d092065c721090f82
parent1d529d83a0693693878749110a05d8b0fa929d0f
parent6a374d266d8213629f74a9f4c9a4984ddf59ef4c
Merging trunk up to r39637.
26 files changed:
CMakeLists.txt
release/scripts/startup/bl_operators/nla.py
release/scripts/startup/bl_operators/object.py
release/scripts/startup/bl_ui/__init__.py
release/scripts/startup/bl_ui/space_dopesheet.py
release/scripts/startup/bl_ui/space_info.py
release/scripts/startup/bl_ui/space_userpref.py
source/blender/blenkernel/intern/anim.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/collada/CMakeLists.txt
source/blender/collada/DocumentExporter.cpp
source/blender/editors/interface/interface.c
source/blender/editors/interface/interface_handlers.c
source/blender/editors/interface/interface_intern.h
source/blender/editors/object/object_add.c
source/blender/editors/space_buttons/buttons_context.c
source/blender/editors/space_outliner/outliner_intern.h
source/blender/editors/space_outliner/outliner_select.c
source/blender/editors/space_sequencer/sequencer_edit.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/transform/transform.c
source/blender/makesrna/intern/CMakeLists.txt
source/blender/makesrna/intern/rna_sequencer.c
source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
source/gameengine/GamePlayer/ghost/GPG_Application.cpp