]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into samual/keepaway
authorSamual <samual@xonotic.org>
Thu, 13 Jan 2011 15:25:05 +0000 (10:25 -0500)
committerSamual <samual@xonotic.org>
Thu, 13 Jan 2011 15:25:05 +0000 (10:25 -0500)
commitcb44cd432f64414f5fa1e1ba7154b34695ddfafc
tree62dc64c3a5bd5f71419918d31367a4973b5d3660
parent759f22b9c5ed5653f4ff0ace6c81d54de42c42e3
parent1fe0c35db0ab3c3f0c57dca862ed5c0927c4f431
Merge branch 'master' into samual/keepaway
defaultXonotic.cfg
qcsrc/server/autocvars.qh
qcsrc/server/cl_client.qc