Merge branch 'master' into Mario/rifle_arena
authorMario <mario.mario@y7mail.com>
Sun, 26 May 2013 10:47:29 +0000 (20:47 +1000)
committerMario <mario.mario@y7mail.com>
Sun, 26 May 2013 10:47:29 +0000 (20:47 +1000)
commit20944d6e9ddda1a515003eca8e69d61a9b1f00df
treed26b7a4d5f95924475921d2b9818ffba805e437f
parent3e52a9528a583d0ede160129dd19829f3e13a902
parentf1ca9e449c3366f505d5d2898cddb8f504974138
Merge branch 'master' into Mario/rifle_arena
defaultXonotic.cfg
effectinfo.txt
qcsrc/common/constants.qh
qcsrc/common/deathtypes.qh
qcsrc/common/notifications.qh
qcsrc/server/autocvars.qh
qcsrc/server/miscfunctions.qc
qcsrc/server/mutators/mutator_riflearena.qc
qcsrc/server/mutators/mutators.qh
qcsrc/server/progs.src