From: Mario <zacjardine@y7mail.com>
Date: Sun, 8 Nov 2015 08:28:35 +0000 (+0000)
Subject: Merge branch 'terencehill/quickmenu_file_example' into 'master'
X-Git-Tag: xonotic-v0.8.2~1687
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e9f30b97435c6afe3d6911f21e1f4fd1b97e93da;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'terencehill/quickmenu_file_example' into 'master'

Quickmenu file example



See merge request !249
---

e9f30b97435c6afe3d6911f21e1f4fd1b97e93da