]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Mario/monsters
authorMario <mario.mario@y7mail.com>
Tue, 25 Jun 2013 06:10:26 +0000 (16:10 +1000)
committerMario <mario.mario@y7mail.com>
Tue, 25 Jun 2013 06:10:26 +0000 (16:10 +1000)
commitb7948bdfd215689f16cacc3467944f2517a2f5a8
treedca3e943f954414df4c35272c537a2f96ddbae2f
parent3319f759f0100be8459754246d4eee70da461300
parent4122acc1401e4643ebe47d53b0488de83b93d787
Merge branch 'master' into Mario/monsters
defaultXonotic.cfg
gamemodes.cfg
qcsrc/qccversion
qcsrc/server/t_items.qc