]> 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: 40f8940 71d8c7e)
Merge branch 'master' into tzork/map-mojoctf
authorMirio <opivy@hotmail.de>
Tue, 25 Oct 2016 23:23:06 +0000 (01:23 +0200)
committerMirio <opivy@hotmail.de>
Tue, 25 Oct 2016 23:23:06 +0000 (01:23 +0200)
1  2 
scripts/shaderlist.txt patch | diff1 | diff2 | blob | history

diff --cc scripts/shaderlist.txt
Simple merge