Merge remote branch 'origin/master' into samual/crosshair_ring_updates
authorSamual <samual@xonotic.org>
Tue, 22 Feb 2011 06:03:51 +0000 (01:03 -0500)
committerSamual <samual@xonotic.org>
Tue, 22 Feb 2011 06:03:51 +0000 (01:03 -0500)
commit547b3d9a16c2d5af2a0177600b276cbbccb63cd0
treeaed944c154ef7b505fc06078b9f13007f67c5a8f
parent442dfa64f41c4cb273b702bbbcf36764e1b536de
parent39a229aee704c8de7e6df120818abbd50c57f622
Merge remote branch 'origin/master' into samual/crosshair_ring_updates
defaultXonotic.cfg
qcsrc/client/autocvars.qh
qcsrc/server/defs.qh
qcsrc/server/g_world.qc