Merge with trunk r37757.
authorJoerg Mueller <nexyon@gmail.com>
Thu, 23 Jun 2011 17:30:56 +0000 (17:30 +0000)
committerJoerg Mueller <nexyon@gmail.com>
Thu, 23 Jun 2011 17:30:56 +0000 (17:30 +0000)
commit413bc87e4f18bb46eeb2f2f52b5278d182b51de8
tree6d67ac820f672bd132ebb628381b0a793403ff7c
parentcc246eaca7bc385738658672e66a5bca8872d5a1
parente7c6b535b0140876ef1b5650c7b259093f07c4b3
Merge with trunk r37757.
source/blender/blenkernel/intern/sequencer.c
source/blender/blenkernel/intern/sound.c
source/blender/blenkernel/intern/writeffmpeg.c
source/blender/editors/space_graph/graph_edit.c
source/blender/makesrna/intern/rna_scene.c
source/gameengine/Converter/KX_ConvertActuators.cpp
source/gameengine/Ketsji/CMakeLists.txt
source/gameengine/Ketsji/KX_SoundActuator.cpp
source/gameengine/Ketsji/KX_SoundActuator.h