]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote-tracking branch 'origin/master' into samual/mutator_ctf
authorSamual <samual@decrux.(none)>
Fri, 18 May 2012 21:55:48 +0000 (17:55 -0400)
committerSamual <samual@decrux.(none)>
Fri, 18 May 2012 21:55:48 +0000 (17:55 -0400)
commitd8e541e5cabb4e7981c0ab2e86f859440f0138f1
tree79cb81cc8bf9c9977496d08b0248caaf2762d6bb
parentd957e789b57a046f8456b5e88ed4abfa5a34f6f1
parentb660d4ba58150ab24834cfb104c3216693daa7d8
Merge remote-tracking branch 'origin/master' into samual/mutator_ctf
12 files changed:
defaultXonotic.cfg
qcsrc/client/autocvars.qh
qcsrc/server/autocvars.qh
qcsrc/server/bot/havocbot/role_ctf.qc
qcsrc/server/cheats.qc
qcsrc/server/cl_client.qc
qcsrc/server/cl_player.qc
qcsrc/server/g_damage.qc
qcsrc/server/g_triggers.qc
qcsrc/server/miscfunctions.qc
qcsrc/server/mutators/gamemode_nexball.qc
qcsrc/server/teamplay.qc