]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Mario/monsters
authorMario <mario.mario@y7mail.com>
Wed, 21 Aug 2013 05:36:39 +0000 (15:36 +1000)
committerMario <mario.mario@y7mail.com>
Wed, 21 Aug 2013 05:36:39 +0000 (15:36 +1000)
commitf89565a5609c6c50fa0bb1c3e3786f20abe31634
treecd54d4701248b547ccf39326a32ba0d93c1371b5
parentf7d3a37aaded37a3fac2af51d22fa6eae7e1ca75
parent23ae96654035b8cda3da563f346b4507d04d73e8
Merge branch 'master' into Mario/monsters
commands.cfg
defaultXonotic.cfg
qcsrc/server/autocvars.qh