Merge remote branch 'origin/master' into samual/updatecommands
authorSamual <samual@xonotic.org>
Sat, 10 Dec 2011 05:10:47 +0000 (00:10 -0500)
committerSamual <samual@xonotic.org>
Sat, 10 Dec 2011 05:10:47 +0000 (00:10 -0500)
commit168e34edfe83e34c20cddf998cb81dea874adb99
treec705386fa5a1d979d6da045dec31ff6696ee16b3
parent2af24a5bd785fb0b2e65a4a69ca658242ff07651
parentd8cd35ee13b53783dd695ad4592ac88651162d9f
Merge remote branch 'origin/master' into samual/updatecommands

Conflicts:
defaultXonotic.cfg
commands.cfg
defaultXonotic.cfg