]> git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/commitdiff
projects / xonotic / xonotic-maps.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6372d29 e577dd0)
Merge branch 'master' into kuniuthefrogg/xoylent_ctf kuniuthefrogg/xoylent_ctf
authorMirio <opivy@hotmail.de>
Sat, 11 Mar 2017 15:12:18 +0000 (16:12 +0100)
committerMirio <opivy@hotmail.de>
Sat, 11 Mar 2017 15:12:18 +0000 (16:12 +0100)
1  2 
scripts/map_xoylent.shader patch | diff1 | diff2 | blob | history

diff --cc scripts/map_xoylent.shader
index ab00717072cc9db071111aa9f9f0e7f748f302c8,07b92eb120a2a429fc946eca80bb75bbb04dbe3a..ab00717072cc9db071111aa9f9f0e7f748f302c8
mode 100755,100644..100644
--- 1/scripts/map_xoylent.shader
--- 2/scripts/map_xoylent.shader
+++ b/scripts/map_xoylent.shader