Merge remote branch 'origin/master' into samual/updatecommands
authorSamual <samual@xonotic.org>
Fri, 30 Dec 2011 15:39:48 +0000 (10:39 -0500)
committerSamual <samual@xonotic.org>
Fri, 30 Dec 2011 15:39:48 +0000 (10:39 -0500)
commitcc12a5558fc68f65a18176eb88047ba4d64f61cc
tree51f148a78614f27ec8e2bb8dccbdae67d6fb4737
parentf8cf9ad90152dfdb03b9d4c613018c45a543c181
parent14b17fcb4ec7aa84553f06eb8c711fe09f8f38be
Merge remote branch 'origin/master' into samual/updatecommands
defaultXonotic.cfg
qcsrc/client/Main.qc
qcsrc/server/cl_client.qc
qcsrc/server/cl_player.qc
qcsrc/server/defs.qh