Merge remote branch 'origin/master' into samual/keepaway
authorunknown <samual@xonotic.org>
Thu, 25 Nov 2010 01:39:19 +0000 (20:39 -0500)
committerunknown <samual@xonotic.org>
Thu, 25 Nov 2010 01:39:19 +0000 (20:39 -0500)
1  2 
qcsrc/client/hud.qc
qcsrc/client/scoreboard.qc
qcsrc/common/constants.qh
qcsrc/server/cl_client.qc
qcsrc/server/clientcommands.qc
qcsrc/server/defs.qh
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