orxonox/trunk: merged the preferences back to the trunk merged with command: svn merge https://svn.orxonox.net/orxonox/branches/preferences . -r7233:HEAD no conflicts… nice work