]> 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: aab33b9 ac62d27)
Merge branch 'master' into divVerent/archived/fruitiex/textures
authorRudolf Polzer <divverent@alientrap.org>
Tue, 28 Sep 2010 14:35:04 +0000 (16:35 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 28 Sep 2010 14:35:04 +0000 (16:35 +0200)
1  2 
scripts/exx.shader patch | diff1 | diff2 | blob | history
scripts/trak5x.shader patch | diff1 | diff2 | blob | history

diff --cc scripts/exx.shader
Simple merge
diff --cc scripts/trak5x.shader
Simple merge