]> 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: 0db6131 5d2f745)
Merge branch 'master' into Justin/erbium
authorMirio <opivy@hotmail.de>
Wed, 20 Jan 2016 09:00:38 +0000 (10:00 +0100)
committerMirio <opivy@hotmail.de>
Wed, 20 Jan 2016 09:00:38 +0000 (10:00 +0100)
1  2 
scripts/shaderlist.txt patch | diff1 | diff2 | blob | history

diff --cc scripts/shaderlist.txt
Simple merge