Merge branch 'master' into Mario/domination_roundbased
authorMario <zacjardine@y7mail.com>
Thu, 13 Nov 2014 15:02:50 +0000 (02:02 +1100)
committerMario <zacjardine@y7mail.com>
Thu, 13 Nov 2014 15:02:50 +0000 (02:02 +1100)
commit9138acec2282209ac6867c5a34365cff3fb8fa64
tree86eb6c869a6575ad45ea80714f0e4bdd1859aebf
parent261bc006336c0511e6aa2157f72d06ddb826022e
parent22cd565b717daf5c4b2c327cfb3d6ad2b851a719
Merge branch 'master' into Mario/domination_roundbased

Conflicts:
qcsrc/common/constants.qh
gamemodes.cfg
qcsrc/common/notifications.qh
qcsrc/server/autocvars.qh
qcsrc/server/mutators/gamemode_domination.qc
qcsrc/server/teamplay.qc