]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Mario/monsters
authorMario <mario.mario@y7mail.com>
Thu, 4 Apr 2013 22:29:36 +0000 (09:29 +1100)
committerMario <mario.mario@y7mail.com>
Thu, 4 Apr 2013 22:29:36 +0000 (09:29 +1100)
commit0e29d60e2cb1882096042fd5a0488454bcc19383
tree9f0afc6d46698fe05331e9c548eff152e0066016
parentade4baffae1193ea32bd885a4a0855305273a1a3
parent3dc40508b67a99d214d774104ecaa0b974d704aa
Merge branch 'master' into Mario/monsters
defaultXonotic.cfg