]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Mario/monsters
authorMario <mario.mario@y7mail.com>
Wed, 28 Aug 2013 11:04:10 +0000 (21:04 +1000)
committerMario <mario.mario@y7mail.com>
Wed, 28 Aug 2013 11:04:10 +0000 (21:04 +1000)
commit10d5434becc8bb7bdbced64619272bdc31c8056d
treede8a053cd0ec12d3e7ca69ed1f5257d4422275d4
parentf89565a5609c6c50fa0bb1c3e3786f20abe31634
parent24ad2e2db014273ecb7fe4d7e5b203288d949d6b
Merge branch 'master' into Mario/monsters
commands.cfg
defaultXonotic.cfg
qcsrc/server/command/sv_cmd.qc
qcsrc/server/g_world.qc