Merge remote branch 'origin/master' into samual/keepaway
authorSamual <samual@xonotic.org>
Sun, 12 Dec 2010 20:52:06 +0000 (15:52 -0500)
committerSamual <samual@xonotic.org>
Sun, 12 Dec 2010 20:52:06 +0000 (15:52 -0500)
commitc4052acb21de917a6010586315bf102e262eb986
treef857cd5cd6cd4207b161b62d17ea85dac1c30b37
parentf15fdd04feb2eba35cd75f5da19b50a50379ec64
parent49aab18fe6f03a9eaae8c0cbd385450bc4171f34
Merge remote branch 'origin/master' into samual/keepaway
Hope to god that this works.
defaultXonotic.cfg
qcsrc/server/mutators/gamemode_keepaway.qc