Merge branch 'master' into divVerent/4team_ctf
authorMario <mario.mario@y7mail.com>
Sat, 14 Sep 2013 08:27:26 +0000 (18:27 +1000)
committerMario <mario.mario@y7mail.com>
Sat, 14 Sep 2013 08:27:26 +0000 (18:27 +1000)
commit8e875564b9f6674e5aaba72d89be85a13ceee738
tree78d401f32bb8780ad8849d246b49fff2302fcffb
parentb71325b30eb0a34b8f04bb044f14046a684be49a
parent06ee57203283ee16b27a716619866d0a524b6505
Merge branch 'master' into divVerent/4team_ctf
qcsrc/common/notifications.qh
qcsrc/server/mutators/gamemode_ca.qc
qcsrc/server/mutators/gamemode_ctf.qc
qcsrc/server/mutators/gamemode_ctf.qh