Merge remote-tracking branch 'origin/master' into samual/respawn_improvements
authorSamual Lenks <samual@xonotic.org>
Tue, 7 May 2013 17:04:11 +0000 (13:04 -0400)
committerSamual Lenks <samual@xonotic.org>
Tue, 7 May 2013 17:04:11 +0000 (13:04 -0400)
commit2d6ef1ff7ca2b80ee5118ff7ceb4d2af6daf7a32
tree2140e3979286ac8610a184f74056ba32cc864076
parentb80f804933b243e66d35d5ae2820dc914979de24
parent0732a090cbd6716be4c93cdc666adf5262dc845b
Merge remote-tracking branch 'origin/master' into samual/respawn_improvements

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