]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
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)
commit37577ef2b6b6c9ef8b13d5bf5a9bf7f3046a3669
tree83896ae17cef204512bc3ed54412dfab1808b4b3
parent927936b74ea7b7f558a52f59d8eba636c01fda7d
parent905b29ad0ad0caa326c09034738357b2c77d5af6
Merge branch 'Mario/ctf_rankings' into 'master'

Merge branch Mario/ctf_rankings (S merge request)

See merge request !405
gamemodes.cfg
qcsrc/common/util.qh
qcsrc/server/mutators/mutator/gamemode_ctf.qc
qcsrc/server/race.qc