Merge branch 'Mario/ctf_rankings' into 'master'
authorMario <zacjardine@y7mail.com>
Sun, 29 Jan 2017 11:53:34 +0000 (11:53 +0000)
committerMario <zacjardine@y7mail.com>
Sun, 29 Jan 2017 11:53:34 +0000 (11:53 +0000)
Merge branch Mario/ctf_rankings (S merge request)

See merge request !405

1  2 
gamemodes.cfg
qcsrc/common/util.qh
qcsrc/server/mutators/mutator/gamemode_ctf.qc
qcsrc/server/race.qc

diff --cc gamemodes.cfg
Simple merge
Simple merge
Simple merge