From: Mario <zacjardine@y7mail.com>
Date: Mon, 20 Jul 2015 11:19:21 +0000 (+0000)
Subject: Merge branch 'Melanosuchus/q3map2_help' into 'master'
X-Git-Tag: xonotic-v0.8.1~1^2~2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c6378c2c623e72d1890feda4afc85d25cb636d9b;p=xonotic%2Fnetradiant.git

Merge branch 'Melanosuchus/q3map2_help' into 'master'

Add help options to q3map2

Closes #9

See merge request !5
---

c6378c2c623e72d1890feda4afc85d25cb636d9b