orxonox/branches/textEngine: merged trunk here. merged with command: svn merge ../trunk textEngine -r 3467:HEAD no conflicts