Merge branch 'Mario/ctf_rankings' into 'master'

author Mario <zacjardine@y7mail.com>

Sun, 29 Jan 2017 11:53:34 +0000 (11:53 +0000)

committer Mario <zacjardine@y7mail.com>

Sun, 29 Jan 2017 11:53:34 +0000 (11:53 +0000)
author Mario <zacjardine@y7mail.com>
Sun, 29 Jan 2017 11:53:34 +0000 (11:53 +0000)
committer Mario <zacjardine@y7mail.com>
Sun, 29 Jan 2017 11:53:34 +0000 (11:53 +0000)
diff --cc gamemodes.cfg
Simple merge
diff --cc qcsrc/common/util.qh
Simple merge
diff --cc qcsrc/server/mutators/mutator/gamemode_ctf.qc
Simple merge
diff --cc qcsrc/server/race.qc
Simple merge
author	Mario <zacjardine@y7mail.com>
	Sun, 29 Jan 2017 11:53:34 +0000 (11:53 +0000)
committer	Mario <zacjardine@y7mail.com>
	Sun, 29 Jan 2017 11:53:34 +0000 (11:53 +0000)
		1	2
gamemodes.cfg	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/common/util.qh	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutator/gamemode_ctf.qc	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/server/race.qc	patch \|	diff1 \|	diff2 \|	blob \| history