# HG changeset patch
# User nemo
# Date 1280067394 14400
# Node ID 19be65b12c43cc2ec709137a58f022e9346a261b
# Parent  f9c8fc74ac934e78b54f7de3afa4c69aa24c96a2# Parent  3f7a95234d8a519e40fd2217b434612b6ab5fc6b
merge. forgot again.

diff -r 3f7a95234d8a -r 19be65b12c43 hedgewars/uLandTexture.pas
--- a/hedgewars/uLandTexture.pas	Sun Jul 25 01:59:41 2010 +0200
+++ b/hedgewars/uLandTexture.pas	Sun Jul 25 10:16:34 2010 -0400
@@ -101,7 +101,7 @@
                     begin
                     shouldUpdate:= false;
                     glBindTexture(GL_TEXTURE_2D, tex^.id);
-                    glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, TEXSIZE, TEXSIZE, GL_RGBA, GL_UNSIGNED_BYTE, Pixels(x, y));
+                    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, TEXSIZE, TEXSIZE, 0, GL_RGBA, GL_UNSIGNED_BYTE, Pixels(x,y)); 
                     end
 end;
 
diff -r 3f7a95234d8a -r 19be65b12c43 share/hedgewars/Data/Themes/Brick/Splash.png
Binary file share/hedgewars/Data/Themes/Brick/Splash.png has changed
diff -r 3f7a95234d8a -r 19be65b12c43 share/hedgewars/Data/Themes/Stage/Splash.png
Binary file share/hedgewars/Data/Themes/Stage/Splash.png has changed