Merge remote branch 'origin/master' into samual/updatecommands
authorSamual <samual@xonotic.org>
Mon, 19 Dec 2011 20:52:19 +0000 (15:52 -0500)
committerSamual <samual@xonotic.org>
Mon, 19 Dec 2011 20:52:19 +0000 (15:52 -0500)
commit8f0281c70368ec92197867d6181e5e955b5fd6c1
tree1867f569b22d59651b683c64aefddf5d20f106e5
parentba78ff1763294e15561f1176a888503433e169f4
parent12ffb9798ae456940accc88fa00d0f29beaa8413
Merge remote branch 'origin/master' into samual/updatecommands

Conflicts:
defaultXonotic.cfg
defaultXonotic.cfg