Merge remote branch 'origin/master' into samual/updatecommands
authorSamual <samual@xonotic.org>
Thu, 4 Aug 2011 17:53:53 +0000 (13:53 -0400)
committerSamual <samual@xonotic.org>
Thu, 4 Aug 2011 17:53:53 +0000 (13:53 -0400)
commit9342fa27f9245d9dd57c524876e583475fe3c0f9
tree87b3b865413a84f3eb5c8f0837628e0e96461525
parent1755141520a1d040da0296a5db35b6076f27eb4d
parent708976a974ecbc3e5dbc646e6e5063a7e700080a
Merge remote branch 'origin/master' into samual/updatecommands

Conflicts:
qcsrc/server/clientcommands.qc
defaultXonotic.cfg
qcsrc/server/clientcommands.qc