From: Samual Lenks <samual@xonotic.org>
Date: Mon, 30 Dec 2013 17:53:26 +0000 (-0500)
Subject: Merge remote-tracking branch 'origin/samual/fix_crosshair_hittest'
X-Git-Tag: xonotic-v0.8.0~248
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=84e4e478a2214e64fdb43b313aa80a7f6a0b3f2c;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote-tracking branch 'origin/samual/fix_crosshair_hittest'

* origin/samual/fix_crosshair_hittest:
  Fix spectating
  Fix crosshair_hittest_showimpact by using proper loc instead of vieworigin
---

84e4e478a2214e64fdb43b313aa80a7f6a0b3f2c