From: Mirio Date: Thu, 30 Mar 2017 17:50:27 +0000 (+0200) Subject: Merge branch 'master' into maddin/shader-weapclip X-Git-Tag: xonotic-v0.8.2~2^2 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0d19be243fd129a59adb5a36318776b0484701d3;p=xonotic%2Fxonotic-maps.pk3dir.git Merge branch 'master' into maddin/shader-weapclip --- 0d19be243fd129a59adb5a36318776b0484701d3