]> 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: fbd7942 a4c63b1)
Merge branch 'master' of ssh://git.xonotic.org/xonotic-maps.pk3dir into divVerent...
authorMaik Merten <maikmerten@googlemail.com>
Sat, 19 Mar 2011 11:58:10 +0000 (12:58 +0100)
committerMaik Merten <maikmerten@googlemail.com>
Sat, 19 Mar 2011 11:58:10 +0000 (12:58 +0100)
1  2 
scripts/shaderlist.txt patch | diff1 | diff2 | blob | history

diff --cc scripts/shaderlist.txt
Simple merge