orxonox/trunk: merged the textEngine back into the trunk. merged with command: svn merge -r 3681:HEAD branches/textEngine/ trunk/
conflicts in: world.cc/h orxonox.cc NEWS changed in favor of the trunk