]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1c406c4 2b9c204)
Merge remote-tracking branch 'origin/samual/fix_crosshair_hittest'
authorSamual Lenks <samual@xonotic.org>
Mon, 30 Dec 2013 17:53:26 +0000 (12:53 -0500)
committerSamual Lenks <samual@xonotic.org>
Mon, 30 Dec 2013 17:53:26 +0000 (12:53 -0500)
* origin/samual/fix_crosshair_hittest:
  Fix spectating
  Fix crosshair_hittest_showimpact by using proper loc instead of vieworigin


Trivial merge