From: Martin Taibr <taibr.martin@gmail.com>
Date: Mon, 2 Jul 2018 07:19:59 +0000 (+0000)
Subject: Merge branch 'northivanastan/docs-cvars' into 'master'
X-Git-Tag: xonotic-v0.8.5~153
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=04aad623720feb36b9282df6fc095751d2d2aa16;p=xonotic%2Fxonotic.git

Merge branch 'northivanastan/docs-cvars' into 'master'

Another update to the documentation - add Halogene's Newbie Corner (fix #227 and #228)

Closes #227 and #228

See merge request xonotic/xonotic!39
---

04aad623720feb36b9282df6fc095751d2d2aa16