Merge branch 'master' into Mario/overkill
[xonotic/xonotic-data.pk3dir.git] / empty.cfg
2010-03-18 xonoticinitial checkin from nexuiz svn r8756 initial