]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into divVerent/4team_ctf
authorMario <mario.mario@y7mail.com>
Tue, 24 Sep 2013 11:10:06 +0000 (04:10 -0700)
committerMario <mario.mario@y7mail.com>
Tue, 24 Sep 2013 11:10:06 +0000 (04:10 -0700)
commitd443aa411d5ba001380775b4cabec80db9701150
treea57d1644f11ce81dc7a3ef2700ad4b928c099df9
parent5ec17170e8528daba3417f8331f7fbaba62ece27
parent1ea3b0365fd6fbb31c38cf6d22ee0b952e9010c1
Merge branch 'master' into divVerent/4team_ctf
qcsrc/client/hud.qc
qcsrc/server/autocvars.qh
qcsrc/server/mutators/gamemode_ctf.qc