]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into divVerent/4team_ctf
authorMario <mario.mario@y7mail.com>
Tue, 3 Dec 2013 14:34:16 +0000 (01:34 +1100)
committerMario <mario.mario@y7mail.com>
Tue, 3 Dec 2013 14:34:16 +0000 (01:34 +1100)
commit25ce29546c1ade2675975d8f406c4972f7979319
tree5695ce9fb544889b3bb48f74657cd89449c89593
parent1dec86a7a2ee9cb1a9e5c32d780771990c4ffc06
parentad8f3ce1398d7fa2204c0282b1d0f84838ca0e92
Merge branch 'master' into divVerent/4team_ctf
gamemodes.cfg
qcsrc/client/hud.qc
qcsrc/client/waypointsprites.qc
qcsrc/common/items.qh
qcsrc/common/notifications.qh
qcsrc/server/autocvars.qh
qcsrc/server/mutators/gamemode_ca.qc
qcsrc/server/mutators/gamemode_ctf.qc
qcsrc/server/mutators/gamemode_ctf.qh
qcsrc/server/mutators/gamemode_freezetag.qc
qcsrc/server/scores_rules.qc