Merge remote branch 'origin/master' into samual/keepaway
authorunknown <samual@xonotic.org>
Thu, 18 Nov 2010 06:58:35 +0000 (01:58 -0500)
committerunknown <samual@xonotic.org>
Thu, 18 Nov 2010 06:58:35 +0000 (01:58 -0500)
1  2 
defaultXonotic.cfg
qcsrc/common/constants.qh
qcsrc/server/defs.qh
qcsrc/server/g_world.qc

Simple merge
Simple merge
Simple merge
Simple merge