Merge remote branch 'origin/master' into samual/flyingspectators
authorSamual <samual@xonotic.org>
Sun, 14 Aug 2011 22:28:31 +0000 (18:28 -0400)
committerSamual <samual@xonotic.org>
Sun, 14 Aug 2011 22:28:31 +0000 (18:28 -0400)
commit6d6a01255c7a5c146bbeb3daae6f527dd40f98d4
tree450eefb15b7b8914022cdc86f2a4931df06408fc
parent6426f2fc8a6e41ebd34a33dd24a23fd6a9926631
parent5eefde1548c4dfd4e8fa20145b9285cdfb970b2a
Merge remote branch 'origin/master' into samual/flyingspectators

Conflicts:
qcsrc/server/t_teleporters.qc
qcsrc/warpzonelib/server.qc
defaultXonotic.cfg
qcsrc/server/cl_client.qc
qcsrc/server/cl_physics.qc
qcsrc/server/defs.qh
qcsrc/server/miscfunctions.qc
qcsrc/server/t_teleporters.qc
qcsrc/warpzonelib/server.qc