Merge remote-tracking branch 'origin/master' into samual/respawn_improvements
authorSamual Lenks <samual@xonotic.org>
Mon, 13 May 2013 21:29:52 +0000 (17:29 -0400)
committerSamual Lenks <samual@xonotic.org>
Mon, 13 May 2013 21:29:52 +0000 (17:29 -0400)
commitcac08f933d832f4b4b63626ddc8c9366f0a69419
treeca25894d9720e2a5d7286b65e342a6a8cf812bfe
parent0fb43b84c6956efd673693beb3494079611e4d24
parentdb46409a1328a95c1742928cddf759fd8ec9b0be
Merge remote-tracking branch 'origin/master' into samual/respawn_improvements

Conflicts:
qcsrc/server/cl_client.qc
defaultXonotic.cfg
qcsrc/server/cl_client.qc
qcsrc/server/miscfunctions.qc
qcsrc/server/progs.src