]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote branch 'origin/master' into samual/flyingspectators
authorSamual <samual@xonotic.org>
Fri, 13 May 2011 00:00:45 +0000 (20:00 -0400)
committerSamual <samual@xonotic.org>
Fri, 13 May 2011 00:00:45 +0000 (20:00 -0400)
commit62b33decfe83f49635c11598c5bcf781f9b26bf1
tree0203d783e84f6469a17f05a0716414bacd4f0496
parent6b1a14c67319613c154e02439c43988edc3c7efa
parente2daf8d138855a357293af335c1406ac2f808870
Merge remote branch 'origin/master' into samual/flyingspectators
defaultXonotic.cfg
qcsrc/server/cl_client.qc
qcsrc/server/defs.qh