Merge remote-tracking branch 'origin/master' into samual/respawn_improvements
authorSamual Lenks <samual@xonotic.org>
Mon, 29 Apr 2013 18:52:10 +0000 (14:52 -0400)
committerSamual Lenks <samual@xonotic.org>
Mon, 29 Apr 2013 18:52:10 +0000 (14:52 -0400)
commitfc0e4c6f26156858a71e0ec62eb974fa11eec2f9
tree0db81d252e6b69b8d24d729ba9a1952a035ce17c
parent5c5b4e9af2d52a2ba705a8414d68c3d2aa2b950d
parent27e0dcee207c9b4ab3e36bde11dee4dcb260bd13
Merge remote-tracking branch 'origin/master' into samual/respawn_improvements

Conflicts:
qcsrc/client/Main.qc
qcsrc/common/constants.qh
qcsrc/client/Main.qc
qcsrc/common/constants.qh
qcsrc/server/cl_client.qc
qcsrc/server/miscfunctions.qc
qcsrc/server/progs.src