Merge branch 'master' into Lyberta/KillSound
[xonotic/xonotic-data.pk3dir.git] / fte_bimap.txt
2010-03-18 xonoticinitial checkin from nexuiz svn r8756 initial