]> 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: 470eacc c99fd13)
Merge branch 'master' into Mirio/implosion
authorMario <zacjardine@y7mail.com>
Tue, 2 Dec 2014 02:31:42 +0000 (13:31 +1100)
committerMario <zacjardine@y7mail.com>
Tue, 2 Dec 2014 02:31:42 +0000 (13:31 +1100)
1  2 
scripts/shaderlist.txt patch | diff1 | diff2 | blob | history

diff --cc scripts/shaderlist.txt
Simple merge