Merge remote branch 'origin/master' into samual/keepaway
authorunknown <samual@xonotic.org>
Wed, 17 Nov 2010 16:33:53 +0000 (11:33 -0500)
committerunknown <samual@xonotic.org>
Wed, 17 Nov 2010 16:33:53 +0000 (11:33 -0500)
commit907d48e5db2bd5fda1d271ce05aa91ce1f3d47ba
tree0a7550db29fa6befc99b77ffc4f3c1dff00ae32e
parentad097d919a380ee42737f876253b68340e9337bf
parent9de5005504c0c133167f6c122da1d5deb5172963
Merge remote branch 'origin/master' into samual/keepaway
defaultXonotic.cfg
qcsrc/common/util.qc
qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.c