Merge remote-tracking branch 'origin/master' into samual/updatecommands
authorSamual <samual@xonotic.org>
Sun, 25 Sep 2011 18:14:37 +0000 (14:14 -0400)
committerSamual <samual@xonotic.org>
Sun, 25 Sep 2011 18:14:37 +0000 (14:14 -0400)
commit6f4349956b11b36ba20e65e34d39b5029a5eb3ac
treebcf844a5a6d263e5706581bc76a1e1fa570578d3
parent07f355e4e485150de3a31e9626ad00ac52d83879
parentd254fe06df74f80c965487bd791fb9d04d729e3f
Merge remote-tracking branch 'origin/master' into samual/updatecommands

Conflicts:
qcsrc/server/clientcommands.qc
qcsrc/server/defs.qh
qcsrc/server/gamecommand.qc
defaultXonotic.cfg
qcsrc/server/bot/scripting.qc
qcsrc/server/clientcommands.qc
qcsrc/server/defs.qh
qcsrc/server/gamecommand.qc