Merge remote branch 'origin/master' into samual/flyingspectators
authorSamual <samual@xonotic.org>
Sat, 14 May 2011 20:25:07 +0000 (16:25 -0400)
committerSamual <samual@xonotic.org>
Sat, 14 May 2011 20:25:07 +0000 (16:25 -0400)
commit9217f0a954cc581e50461a7603b1f0aea718685e
tree3ac1742cf845893ef03c571034f6203d0baf309e
parent62b33decfe83f49635c11598c5bcf781f9b26bf1
parentc2c411b468a45d756d6860e906b57fadffa72aea
Merge remote branch 'origin/master' into samual/flyingspectators

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