Merge branch 'master' into Mario/ctf_updates
authorMario <zacjardine@y7mail.com>
Mon, 27 Jul 2015 14:45:58 +0000 (00:45 +1000)
committerMario <zacjardine@y7mail.com>
Mon, 27 Jul 2015 14:45:58 +0000 (00:45 +1000)
commit5733b1493c8c3fc14830f78122fe388e89f19338
treeac6f2ed8c57b7d72b664e999eb5efddd12a8cf69
parentf715974f22d9b57b6bb7577c3a3655ec7115f369
parentfd8a3cfbe15df4e9854dbb288157fe863276a696
Merge branch 'master' into Mario/ctf_updates

# Conflicts:
# qcsrc/common/stats.qh
# qcsrc/server/mutators/gamemode_ctf.qc
# qcsrc/server/mutators/gamemode_ctf.qh
gamemodes.cfg
qcsrc/client/waypointsprites.qc
qcsrc/common/stats.qh
qcsrc/server/autocvars.qh
qcsrc/server/mutators/gamemode_ctf.qh