]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote branch 'origin/master' into samual/mutator_ctf
authorSamual <samual@xonotic.org>
Tue, 27 Mar 2012 22:28:37 +0000 (18:28 -0400)
committerSamual <samual@xonotic.org>
Tue, 27 Mar 2012 22:28:37 +0000 (18:28 -0400)
commitbdbce87c90e361d0fbdad2bb30b097d6b7c9ce6b
treefa2af35a24aba6e5e7e0a2dc1c0b96ae63953ff7
parent50700eaa76837175f29f1f366c39adbde1cfdc19
parent5de3300cc5dfbea717feca0cc5320a9650c5e119
Merge remote branch 'origin/master' into samual/mutator_ctf

Conflicts:
qcsrc/server/arena.qc
qcsrc/server/cl_client.qc
qcsrc/server/defs.qh
qcsrc/server/mutators/mutators.qh
qcsrc/server/progs.src
12 files changed:
qcsrc/server/attic/nexball.qc
qcsrc/server/autocvars.qh
qcsrc/server/cl_client.qc
qcsrc/server/cl_player.qc
qcsrc/server/defs.qh
qcsrc/server/g_damage.qc
qcsrc/server/mutators/gamemode_ctf.qc
qcsrc/server/mutators/gamemode_ctf.qh
qcsrc/server/mutators/gamemode_nexball.qc
qcsrc/server/mutators/mutators.qh
qcsrc/server/progs.src
qcsrc/server/teamplay.qc