Merge branch 'master' into Mario/weapons_new
authorMario <zacjardine@y7mail.com>
Thu, 27 Nov 2014 08:54:09 +0000 (19:54 +1100)
committerMario <zacjardine@y7mail.com>
Thu, 27 Nov 2014 08:54:09 +0000 (19:54 +1100)
commit3bc58a45f32841ecde5913aa899172e3093b63a6
treeb11a1a069d67b66dadf31b538acc8de85cbffb04
parent37212248b68e64386f4e5ebcd7da23ad6aad53e9
parent571c1f79dfe4448b4b3d229fc402fc0deac0bf81
Merge branch 'master' into Mario/weapons_new

Conflicts:
qcsrc/client/View.qc
qcsrc/common/stats.qh
qcsrc/server/mutators/mutator_instagib.qc
defaultXonotic.cfg
qcsrc/client/View.qc
qcsrc/client/autocvars.qh
qcsrc/common/stats.qh
qcsrc/server/defs.qh
qcsrc/server/g_damage.qc
qcsrc/server/g_world.qc
qcsrc/server/mutators/mutator_instagib.qc