]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote branch 'origin/master' into samual/updatecommands
authorSamual <samual@xonotic.org>
Fri, 4 Nov 2011 19:41:10 +0000 (15:41 -0400)
committerSamual <samual@xonotic.org>
Fri, 4 Nov 2011 19:41:10 +0000 (15:41 -0400)
commit5836f4f65fb9b51c0f48b47b936033c7a799f273
treebb44d825e571c4343b31f9ec9e49112e5f806296
parent19945e9e7abf817467d7284947efab9d0c2c772d
parentbbb9a7915c10dea610474fe7e0d5c08f9edf62fd
Merge remote branch 'origin/master' into samual/updatecommands

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