]> 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: 1a04e1d 517428d)
Merge branch 'morphed/ionpump' of ssh://git.xonotic.org/xonotic-maps.pk3dir into...
authorMaik Merten <maikmerten@googlemail>
Sat, 9 Oct 2010 18:01:22 +0000 (20:01 +0200)
committerMaik Merten <maikmerten@googlemail>
Sat, 9 Oct 2010 18:01:22 +0000 (20:01 +0200)
1  2 
scripts/liquids_water.shader patch | diff1 | diff2 | blob | history

diff --cc scripts/liquids_water.shader
Simple merge