]> de.git.xonotic.org Git - xonotic/xonotic-maps.pk3dir.git/commitdiff
projects / xonotic / xonotic-maps.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 630c262 5a655fb)
Merge branch 'master' into justin/erbium
authorMirio <opivy@hotmail.de>
Mon, 6 Mar 2017 21:28:55 +0000 (22:28 +0100)
committerMirio <opivy@hotmail.de>
Mon, 6 Mar 2017 21:28:55 +0000 (22:28 +0100)
1  2 
scripts/shaderlist.txt patch | diff1 | diff2 | blob | history

diff --cc scripts/shaderlist.txt
Simple merge