From: terencehill <piuntn@gmail.com>
Date: Tue, 20 Sep 2016 16:33:43 +0000 (+0000)
Subject: Merge branch 'martin-t/keeptwo' into 'master'
X-Git-Tag: xonotic-v0.8.2~573
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e3c690c7e94ed2db77644e5bfe8ab494fb742747;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'martin-t/keeptwo' into 'master'

add cvar description, remove unused vaiable

At least I hope it's unused, I'd expect the compiler to warn about it but it's declared inside a function and only assigned so unless I am missing something obvious, it's not used anywhere.

See merge request !369
---

e3c690c7e94ed2db77644e5bfe8ab494fb742747