Merge remote-tracking branch 'origin/master' into samual/mutator_ctf
authorSamual Lenks <samual@xonotic.org>
Thu, 6 Sep 2012 18:39:04 +0000 (14:39 -0400)
committerSamual Lenks <samual@xonotic.org>
Thu, 6 Sep 2012 18:39:04 +0000 (14:39 -0400)
commit5a80c7ca1221f22c8890c3c144d6a665f807ed83
tree6b3c96b81e553aa08d2d83e794dc910c968638e7
parentd76e045ac37cc6a3231f549435fe76d5e5aab62d
parent65910c53f780ff3dc3bbdd5dbadee90a076f667d
Merge remote-tracking branch 'origin/master' into samual/mutator_ctf

Conflicts:
qcsrc/warpzonelib/common.qh
qcsrc/server/mutators/gamemode_ctf.qc