Merge branch 'master' into divVerent/4team_ctf
authorMario <mario.mario@y7mail.com>
Thu, 15 Aug 2013 03:14:14 +0000 (13:14 +1000)
committerMario <mario.mario@y7mail.com>
Thu, 15 Aug 2013 03:14:14 +0000 (13:14 +1000)
commit9160a9c5f29f0bae57a5c9b7b468ae1ae0061c27
tree3ee70c9c12bab09b036f79f0e38d1a629dc4a970
parent1d58aaaaa8af3501596b202575b11aa7ab744979
parent53fa7721a5a8cbcc20438c90c146c5f7cbf87ff5
Merge branch 'master' into divVerent/4team_ctf
effectinfo.txt
gamemodes.cfg
qcsrc/common/notifications.qh
qcsrc/server/autocvars.qh
qcsrc/server/mutators/gamemode_ca.qc
qcsrc/server/mutators/gamemode_freezetag.qc