From: Mario <zacjardine@y7mail.com>
Date: Mon, 3 Aug 2015 15:41:24 +0000 (+0000)
Subject: Merge branch 'matthiaskrgr/campingsimulator_2015' into 'master'
X-Git-Tag: xonotic-v0.8.1~26
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3cc7d984dec10cdbe7131b4b1a2362997d0eeadb;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'matthiaskrgr/campingsimulator_2015' into 'master'

cl_zoomfactor: max zoom: 16->30

increases the max zoom limit from 16 to 30.

See merge request !159
---

3cc7d984dec10cdbe7131b4b1a2362997d0eeadb