From: Mario <zacjardine@y7mail.com>
Date: Fri, 23 Jan 2015 01:37:37 +0000 (+0000)
Subject: Merge branch 'terencehill/cvar_updates' into 'master'
X-Git-Tag: xonotic-v0.8.1~151
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f12e0d90c7d266d2b899ecb9c7a3eb6ffaeb3282;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'terencehill/cvar_updates' into 'master'

Terencehill/cvar updates

cvar updates

See merge request !82
---

f12e0d90c7d266d2b899ecb9c7a3eb6ffaeb3282