]> 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: ac43db6 bd4eebf)
Merge branch 'master' into debugger/aurora_ctf
authorDebugger <pyngot@hotmail.com>
Wed, 25 Sep 2013 18:31:57 +0000 (20:31 +0200)
committerDebugger <pyngot@hotmail.com>
Wed, 25 Sep 2013 18:31:57 +0000 (20:31 +0200)
1  2 
scripts/shaderlist.txt patch | diff1 | diff2 | blob | history

diff --cc scripts/shaderlist.txt
Simple merge