svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r22668:22701
authorCampbell Barton <ideasman42@gmail.com>
Sat, 22 Aug 2009 10:57:07 +0000 (10:57 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sat, 22 Aug 2009 10:57:07 +0000 (10:57 +0000)
commit1e14ab99926a53fc540f3fb1e2a1e57f0ce559cc
treed94d43f7f663638d1294a1069235059490ba93a9
parent2aa2512a43781f6ac8937c152398e9de731aef07
parenta4f3f5c23c4201bc885310aa17226d2ee3922a2a
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r22668:22701
config/linux2-config.py
source/blender/blenkernel/intern/softbody.c
source/gameengine/GameLogic/SCA_JoystickSensor.cpp
source/gameengine/GameLogic/SCA_JoystickSensor.h
source/gameengine/GameLogic/SCA_MouseSensor.cpp
source/gameengine/GameLogic/SCA_MouseSensor.h
source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp
source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.h
source/gameengine/Ketsji/KX_TouchSensor.cpp
source/gameengine/Ketsji/KX_TouchSensor.h