From: TimePath <andrew.hardaker1995@gmail.com>
Date: Thu, 14 Apr 2016 03:02:09 +0000 (+1000)
Subject: Merge remote-tracking branch 'illwieckz/keepshader'
X-Git-Tag: xonotic-v0.8.2~10
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=85351b6e7f70fc8cdec00844bbb22ac96068150d;p=xonotic%2Fnetradiant.git

Merge remote-tracking branch 'illwieckz/keepshader'
---

85351b6e7f70fc8cdec00844bbb22ac96068150d