Merge remote branch 'origin/master' into samual/keepaway
authorunknown <samual@xonotic.org>
Mon, 29 Nov 2010 08:07:01 +0000 (03:07 -0500)
committerunknown <samual@xonotic.org>
Mon, 29 Nov 2010 08:07:01 +0000 (03:07 -0500)
1  2 
defaultXonotic.cfg
qcsrc/common/util.qc
qcsrc/server/cl_client.qc
qcsrc/server/cl_player.qc
qcsrc/server/defs.qh
qcsrc/server/g_damage.qc
qcsrc/server/g_world.qc
qcsrc/server/progs.src

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge