From: Mario <mario@smbclan.net>
Date: Sun, 12 Mar 2017 19:56:11 +0000 (+1000)
Subject: Merge branch 'master' into Mario/texturebrowser_fix
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c39b971caffea529b9e8a39564dcb23e17bc6cf7;p=xonotic%2Fnetradiant.git

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

c39b971caffea529b9e8a39564dcb23e17bc6cf7