svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r20937:21899
authorCampbell Barton <ideasman42@gmail.com>
Sat, 25 Jul 2009 20:59:09 +0000 (20:59 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sat, 25 Jul 2009 20:59:09 +0000 (20:59 +0000)
commit1b142434055e2b56b23991f0c9d695b6d4f33390
tree8689574221e0d98697af406292b0383c14fc0c3b
parentdff9dce1cdcb5250797f529456649510d2396096
parent1c00eacca2b084d7189de33cb75e8612cb542030
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r20937:21899

missing commits from peter 20942, 21165, 21170, 21174, 21597
these files still need manual merging

source/blender/makesdna/DNA_sequence_types.h
source/blender/src/sequence.c
source/blender/src/seqeffects.c
source/blender/src/editseq.c
source/blender/include/BSE_sequence.h
14 files changed:
blenderplayer/CMakeLists.txt
config/win32-mingw-config.py
source/blender/blenkernel/BKE_softbody.h
source/blender/blenkernel/intern/mesh.c
source/blender/blenkernel/intern/softbody.c
source/blender/blenloader/intern/readfile.c
source/blender/makesdna/DNA_object_force.h
source/blender/render/intern/source/texture.c
source/gameengine/Converter/BL_ActionActuator.cpp
source/gameengine/Converter/BL_ActionActuator.h
source/gameengine/Converter/BL_ArmatureObject.h
source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.cpp
source/gameengine/Ketsji/KX_MeshProxy.cpp
source/gameengine/Ketsji/KX_SoundActuator.cpp