Merge branch 'martin-t/help' into 'master'
authorMario <zacjardine@y7mail.com>
Sun, 30 Sep 2018 05:53:03 +0000 (05:53 +0000)
committerMario <zacjardine@y7mail.com>
Sun, 30 Sep 2018 05:53:03 +0000 (05:53 +0000)
commit04178ec17db0c9a1e726d653216355a1c6ba3918
treeab0a35aa48278e0d2d4130cfa9b107cffafb344d
parent2e575b99074e51af2cdb6e9fc8f57a7a9bb7c138
parentc89ff963bdef4a9c8c6f7b03d45768674f9e9691
Merge branch 'martin-t/help' into 'master'

Help system

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