From: Mario <mario@smbclan.net>
Date: Tue, 11 Jul 2017 06:37:38 +0000 (+1000)
Subject: Merge branch 'master' into Mario/texturebrowser_fix
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=95f4573dfea77e12c302f9e6d37c810bd4a93ce8;p=xonotic%2Fnetradiant.git

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

95f4573dfea77e12c302f9e6d37c810bd4a93ce8