]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into divVerent/4team_ctf
authorMario <mario.mario@y7mail.com>
Fri, 23 Aug 2013 14:19:11 +0000 (00:19 +1000)
committerMario <mario.mario@y7mail.com>
Fri, 23 Aug 2013 14:19:11 +0000 (00:19 +1000)
commit1b3e50c4e9e9bb237378ce85c9125f895fc4c455
tree12bd079a570f9a485708877d52237f5d88f2ace9
parent04b7e171214df00aa2d6b4a5174bee67b709b973
parent23ae96654035b8cda3da563f346b4507d04d73e8
Merge branch 'master' into divVerent/4team_ctf
qcsrc/client/hud.qc
qcsrc/server/autocvars.qh
qcsrc/server/mutators/gamemode_ctf.qc