Merge branch 'master' into Mario/overkill
authorMario <zacjardine@y7mail.com>
Tue, 16 Dec 2014 03:36:30 +0000 (14:36 +1100)
committerMario <zacjardine@y7mail.com>
Tue, 16 Dec 2014 03:36:30 +0000 (14:36 +1100)
commit5dbda91e68e08abcedef699f99c3654c8f97242b
tree1a1a8995c686ef1cf6f1fab53c0f5e7433eeb134
parent47c02cec495b4188dfc122b77393429ae257e14b
parent9179659ce2defb99b5a599ef799bb7905824b9bc
Merge branch 'master' into Mario/overkill
mutators.cfg
qcsrc/client/View.qc
qcsrc/client/autocvars.qh
qcsrc/client/hud.qc
qcsrc/client/weapons/projectile.qc
qcsrc/common/notifications.qh
qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c
qcsrc/server/autocvars.qh
qcsrc/server/defs.qh
qcsrc/server/g_damage.qc
qcsrc/server/mutators/mutator_instagib.qc