Merge branch 'master' into Mario/monsters
authorMario <mario.mario@y7mail.com>
Fri, 31 May 2013 19:43:21 +0000 (05:43 +1000)
committerMario <mario.mario@y7mail.com>
Fri, 31 May 2013 19:43:21 +0000 (05:43 +1000)
commit264bfe3c675e13957c0188c75276af431f8a433f
tree814ce23e12893949ab843f681e589df6f50b7f6a
parent80b17be33c51348ea6f5ee8242a1f859ec4ffa50
parentd91b3e89615fe69b76d6e7f12327bf9efb03e1e6
Merge branch 'master' into Mario/monsters
commands.cfg
defaultXonotic.cfg
qcsrc/server/command/sv_cmd.qc
qcsrc/server/mutators/gamemode_ctf.qc