Merge with trunk up to r38584.
authorJoerg Mueller <nexyon@gmail.com>
Thu, 21 Jul 2011 21:11:58 +0000 (21:11 +0000)
committerJoerg Mueller <nexyon@gmail.com>
Thu, 21 Jul 2011 21:11:58 +0000 (21:11 +0000)
commit4532bd731d5edbe348d4df810856f6bdfdea705c
tree778fdcd594b5f384eacf5cd82f50afc10bbed513
parentcf34f7509f4ea8c3f0c92045933f089c72de5313
parentbbfe3c9c49523d3987a3144da119d8f6afd09cf9
Merge with trunk up to r38584.
15 files changed:
intern/audaspace/CMakeLists.txt
release/scripts/startup/bl_ui/space_userpref.py
source/blender/blenkernel/intern/sequencer.c
source/blender/blenkernel/intern/sound.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/collada/CMakeLists.txt
source/blender/editors/space_outliner/CMakeLists.txt
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/intern/rna_constraint.c
source/blender/windowmanager/intern/wm_files.c
source/gameengine/Expressions/PyObjectPlus.h
source/gameengine/Ketsji/CMakeLists.txt
source/gameengine/Ketsji/KX_PythonInit.cpp
source/gameengine/Ketsji/SConscript