From: Mirio <opivy@hotmail.de>
Date: Sat, 11 Mar 2017 15:12:18 +0000 (+0100)
Subject: Merge branch 'master' into kuniuthefrogg/xoylent_ctf
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=refs%2Fheads%2Fkuniuthefrogg%2Fxoylent_ctf;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'master' into kuniuthefrogg/xoylent_ctf
---

21d6fc7a943501f612069aeab80b76a515bb1c89
diff --cc scripts/map_xoylent.shader
index ab007170,07b92eb1..ab007170
mode 100755,100644..100644
--- a/scripts/map_xoylent.shader
+++ b/scripts/map_xoylent.shader