From: Mario <zacjardine@y7mail.com>
Date: Mon, 1 Jan 2018 05:58:56 +0000 (+0000)
Subject: Merge branch 'Player_2/ScrollingCamera' into 'master'
X-Git-Tag: xonotic-v0.8.5~2393
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0e63ac30fcee5714ea4b53b94e0169ed48089f90;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Player_2/ScrollingCamera' into 'master'

Cleaned up viewloc.qc and added free-aiming cursor support.

See merge request xonotic/xonotic-data.pk3dir!516
---

0e63ac30fcee5714ea4b53b94e0169ed48089f90