Merge branch 'master' into Mario/overkill
authorMario <zacjardine@y7mail.com>
Sat, 13 Dec 2014 11:12:43 +0000 (22:12 +1100)
committerMario <zacjardine@y7mail.com>
Sat, 13 Dec 2014 11:12:43 +0000 (22:12 +1100)
commitdf110eb632e3d04119c2d0771e0d54c1a1ea27b8
tree1c7921b8af7e60910027d76f8fd93e6b975881bb
parent91130000607f9764d71fe80e327d0ef7c4bcc2ed
parent33bf0468e63202a6bf2fbc0896f185347e032de2
Merge branch 'master' into Mario/overkill

Conflicts:
qcsrc/common/notifications.qh
qcsrc/server/mutators/mutator_instagib.qc
qcsrc/client/View.qc
qcsrc/client/weapons/projectile.qc
qcsrc/common/notifications.qh
qcsrc/server/defs.qh
qcsrc/server/mutators/mutator_instagib.qc
qcsrc/server/mutators/mutator_nades.qc