From: Mario <zacjardine@y7mail.com>
Date: Sun, 30 Sep 2018 05:53:03 +0000 (+0000)
Subject: Merge branch 'martin-t/help' into 'master'
X-Git-Tag: xonotic-v0.8.5~1814
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=04178ec17db0c9a1e726d653216355a1c6ba3918;p=xonotic%2Fxonotic-data.pk3dir.git

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

Help system

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

04178ec17db0c9a1e726d653216355a1c6ba3918