Last commit fixed the file contents.. but some svn props were missing.
authorAndre Susano Pinto <andresusanopinto@gmail.com>
Tue, 15 Jul 2008 21:08:39 +0000 (21:08 +0000)
committerAndre Susano Pinto <andresusanopinto@gmail.com>
Tue, 15 Jul 2008 21:08:39 +0000 (21:08 +0000)
commit8d94bfec1b9f692474d74441ec92ef5d3765e8e5
tree74e10c4aea690c6fc3e068b43c7fe3b8125f0c67
parentafc30d1a33506d8c0fb08f6b2df7856071383430
Last commit fixed the file contents.. but some svn props were missing.

So I fixed the problem with merges instead of copying files over.
Also trunk/blender/release/scripts/scripttemplate_ipo_gen.py from revision 14530 was missing. (that was fixed)

svn merge -r 15590:15551 https://svn.blender.org/svnroot/bf-blender/branches/soc-2008-jaguarandi (revert changes to the point where the merge was incorrect)
svn merge -r 15552:15572 https://svn.blender.org/svnroot/bf-blender/branches/soc-2008-jaguarandi (apply branch modifications)
svn merge -r 15392:15590 https://svn.blender.org/svnroot/bf-blender/trunk/blender (merge from trunk)
source/gameengine/GameLogic/SCA_ActuatorEventManager.cpp
source/gameengine/GameLogic/SCA_ActuatorEventManager.h
source/gameengine/GameLogic/SCA_ActuatorSensor.cpp
source/gameengine/GameLogic/SCA_ActuatorSensor.h
source/gameengine/Ketsji/KX_NearSensor.cpp
source/gameengine/Ketsji/KX_RadarSensor.cpp
source/gameengine/Rasterizer/Makefile