]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into mario/monsters
authorMario <mario.mario@y7mail.com>
Sun, 3 Mar 2013 21:30:21 +0000 (08:30 +1100)
committerMario <mario.mario@y7mail.com>
Sun, 3 Mar 2013 21:30:21 +0000 (08:30 +1100)
commit27513c29a36495d6b9276f03f560b6f2f409675a
tree045b36e745640915ce0c2b650b0c24330509ca81
parent8b98f266c69bdba61dba6f80598be73a1dd07362
parent2943f92625e646fd828c733b812ef36ed79370eb
Merge branch 'master' into mario/monsters
commands.cfg
defaultXonotic.cfg