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)
commit9157b0d37ed9867017bd45109b73681abf26d4fa
treee8bed4e4444071ef9d3e35789c06772dc472beae
parente2166305fc4bf0257ce670d1c9e630b91195bee0
parent3fd329063fde6a1e366c16497858035632a576e4
Merge remote branch 'origin/master' into samual/keepaway
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