From: Mario <mario@smbclan.net>
Date: Sun, 16 Jul 2017 10:00:45 +0000 (+1000)
Subject: Merge branch 'master' into Mario/texturebrowser_fix
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=adad6a8644da8285e839cc48034f7866ce399221;p=xonotic%2Fnetradiant.git

Merge branch 'master' into Mario/texturebrowser_fix
---

adad6a8644da8285e839cc48034f7866ce399221