]> 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: cd945fa bd4eebf)
Merge branch 'master' into matthiaskrgr/aurora_ctf2 matthiaskrgr/aurora_ctf2
authorMatthias Krüger <matthias.krueger@famsik.de>
Tue, 27 Aug 2013 23:54:49 +0000 (01:54 +0200)
committerMatthias Krüger <matthias.krueger@famsik.de>
Tue, 27 Aug 2013 23:54:49 +0000 (01:54 +0200)
1  2 
scripts/shaderlist.txt patch | diff1 | diff2 | blob | history

diff --cc scripts/shaderlist.txt
Simple merge