Merge branch 'master' into samual/keepaway
authorSamual <samual@xonotic.org>
Mon, 10 Jan 2011 03:10:47 +0000 (22:10 -0500)
committerSamual <samual@xonotic.org>
Mon, 10 Jan 2011 03:10:47 +0000 (22:10 -0500)
commit04f7d85114bae0e592f9b0ef38d97902ed39f560
tree9b9c7f68c4c7d85d4a53993f08d94a5a648fbd17
parentc4052acb21de917a6010586315bf102e262eb986
parent000100e5a06711f313310a4c35468e00c222eb4e
Merge branch 'master' into samual/keepaway
defaultXonotic.cfg