# HG changeset patch # User nemo # Date 1282088597 14400 # Node ID 8461f0cef2e6b10fa46852137eb7c3078dab9e2e # Parent 2e7dda50fdddeee526fa2436c5c3c9453a5a155a# Parent 73246d25dfe19d8278158c7cf61d529f7544fdb5 merge diff -r 73246d25dfe1 -r 8461f0cef2e6 share/hedgewars/Data/Themes/Art/BlueWater.png Binary file share/hedgewars/Data/Themes/Art/BlueWater.png has changed diff -r 73246d25dfe1 -r 8461f0cef2e6 share/hedgewars/Data/Themes/Art/Border.png Binary file share/hedgewars/Data/Themes/Art/Border.png has changed diff -r 73246d25dfe1 -r 8461f0cef2e6 share/hedgewars/Data/Themes/Art/Chunk.png Binary file share/hedgewars/Data/Themes/Art/Chunk.png has changed diff -r 73246d25dfe1 -r 8461f0cef2e6 share/hedgewars/Data/Themes/Art/Clouds.png Binary file share/hedgewars/Data/Themes/Art/Clouds.png has changed diff -r 73246d25dfe1 -r 8461f0cef2e6 share/hedgewars/Data/Themes/Art/Droplet.png Binary file share/hedgewars/Data/Themes/Art/Droplet.png has changed diff -r 73246d25dfe1 -r 8461f0cef2e6 share/hedgewars/Data/Themes/Art/Flake.png Binary file share/hedgewars/Data/Themes/Art/Flake.png has changed diff -r 73246d25dfe1 -r 8461f0cef2e6 share/hedgewars/Data/Themes/Art/Girder.png Binary file share/hedgewars/Data/Themes/Art/Girder.png has changed diff -r 73246d25dfe1 -r 8461f0cef2e6 share/hedgewars/Data/Themes/Art/LandBackTex.png Binary file share/hedgewars/Data/Themes/Art/LandBackTex.png has changed diff -r 73246d25dfe1 -r 8461f0cef2e6 share/hedgewars/Data/Themes/Art/LandTex.png Binary file share/hedgewars/Data/Themes/Art/LandTex.png has changed diff -r 73246d25dfe1 -r 8461f0cef2e6 share/hedgewars/Data/Themes/Art/Mona.png Binary file share/hedgewars/Data/Themes/Art/Mona.png has changed diff -r 73246d25dfe1 -r 8461f0cef2e6 share/hedgewars/Data/Themes/Art/Schrei.png Binary file share/hedgewars/Data/Themes/Art/Schrei.png has changed diff -r 73246d25dfe1 -r 8461f0cef2e6 share/hedgewars/Data/Themes/Art/Sky.png Binary file share/hedgewars/Data/Themes/Art/Sky.png has changed diff -r 73246d25dfe1 -r 8461f0cef2e6 share/hedgewars/Data/Themes/Art/Soup.png Binary file share/hedgewars/Data/Themes/Art/Soup.png has changed diff -r 73246d25dfe1 -r 8461f0cef2e6 share/hedgewars/Data/Themes/Art/Splash.png Binary file share/hedgewars/Data/Themes/Art/Splash.png has changed diff -r 73246d25dfe1 -r 8461f0cef2e6 share/hedgewars/Data/Themes/Art/Thumbs.db Binary file share/hedgewars/Data/Themes/Art/Thumbs.db has changed diff -r 73246d25dfe1 -r 8461f0cef2e6 share/hedgewars/Data/Themes/Art/Zeit.png Binary file share/hedgewars/Data/Themes/Art/Zeit.png has changed diff -r 73246d25dfe1 -r 8461f0cef2e6 share/hedgewars/Data/Themes/Art/horizont.png Binary file share/hedgewars/Data/Themes/Art/horizont.png has changed diff -r 73246d25dfe1 -r 8461f0cef2e6 share/hedgewars/Data/Themes/Art/icon.png Binary file share/hedgewars/Data/Themes/Art/icon.png has changed diff -r 73246d25dfe1 -r 8461f0cef2e6 share/hedgewars/Data/Themes/Brick/BlueWater.png Binary file share/hedgewars/Data/Themes/Brick/BlueWater.png has changed diff -r 73246d25dfe1 -r 8461f0cef2e6 share/hedgewars/Data/Themes/Brick/Border.png Binary file share/hedgewars/Data/Themes/Brick/Border.png has changed diff -r 73246d25dfe1 -r 8461f0cef2e6 share/hedgewars/Data/Themes/Brick/Chunk.png Binary file share/hedgewars/Data/Themes/Brick/Chunk.png has changed diff -r 73246d25dfe1 -r 8461f0cef2e6 share/hedgewars/Data/Themes/Brick/Droplet.png Binary file share/hedgewars/Data/Themes/Brick/Droplet.png has changed diff -r 73246d25dfe1 -r 8461f0cef2e6 share/hedgewars/Data/Themes/Brick/Flake.png Binary file share/hedgewars/Data/Themes/Brick/Flake.png has changed diff -r 73246d25dfe1 -r 8461f0cef2e6 share/hedgewars/Data/Themes/Brick/Girder.png Binary file share/hedgewars/Data/Themes/Brick/Girder.png has changed diff -r 73246d25dfe1 -r 8461f0cef2e6 share/hedgewars/Data/Themes/Brick/LandBackTex.png Binary file share/hedgewars/Data/Themes/Brick/LandBackTex.png has changed diff -r 73246d25dfe1 -r 8461f0cef2e6 share/hedgewars/Data/Themes/Brick/LandTex.png Binary file share/hedgewars/Data/Themes/Brick/LandTex.png has changed diff -r 73246d25dfe1 -r 8461f0cef2e6 share/hedgewars/Data/Themes/Brick/Sky.png Binary file share/hedgewars/Data/Themes/Brick/Sky.png has changed diff -r 73246d25dfe1 -r 8461f0cef2e6 share/hedgewars/Data/Themes/Brick/Splash.png Binary file share/hedgewars/Data/Themes/Brick/Splash.png has changed diff -r 73246d25dfe1 -r 8461f0cef2e6 share/hedgewars/Data/Themes/Brick/horizont.png Binary file share/hedgewars/Data/Themes/Brick/horizont.png has changed diff -r 73246d25dfe1 -r 8461f0cef2e6 share/hedgewars/Data/Themes/Brick/icon.png Binary file share/hedgewars/Data/Themes/Brick/icon.png has changed diff -r 73246d25dfe1 -r 8461f0cef2e6 share/hedgewars/Data/Themes/Brick/plant1.png Binary file share/hedgewars/Data/Themes/Brick/plant1.png has changed diff -r 73246d25dfe1 -r 8461f0cef2e6 share/hedgewars/Data/Themes/Brick/plant2.png Binary file share/hedgewars/Data/Themes/Brick/plant2.png has changed diff -r 73246d25dfe1 -r 8461f0cef2e6 share/hedgewars/Data/Themes/Brick/plant3.png Binary file share/hedgewars/Data/Themes/Brick/plant3.png has changed diff -r 73246d25dfe1 -r 8461f0cef2e6 share/hedgewars/Data/Themes/Brick/plant4.png Binary file share/hedgewars/Data/Themes/Brick/plant4.png has changed diff -r 73246d25dfe1 -r 8461f0cef2e6 share/hedgewars/Data/Themes/Brick/plant5.png Binary file share/hedgewars/Data/Themes/Brick/plant5.png has changed diff -r 73246d25dfe1 -r 8461f0cef2e6 share/hedgewars/Data/Themes/Brick/plant6.png Binary file share/hedgewars/Data/Themes/Brick/plant6.png has changed diff -r 73246d25dfe1 -r 8461f0cef2e6 share/hedgewars/Data/Themes/Brick/plant7.png Binary file share/hedgewars/Data/Themes/Brick/plant7.png has changed diff -r 73246d25dfe1 -r 8461f0cef2e6 share/hedgewars/Data/Themes/Brick/plant8.png Binary file share/hedgewars/Data/Themes/Brick/plant8.png has changed diff -r 73246d25dfe1 -r 8461f0cef2e6 share/hedgewars/Data/Themes/Brick/plant9.png Binary file share/hedgewars/Data/Themes/Brick/plant9.png has changed diff -r 73246d25dfe1 -r 8461f0cef2e6 share/hedgewars/Data/Themes/Brick/spray1.png Binary file share/hedgewars/Data/Themes/Brick/spray1.png has changed diff -r 73246d25dfe1 -r 8461f0cef2e6 share/hedgewars/Data/Themes/Brick/spray2.png Binary file share/hedgewars/Data/Themes/Brick/spray2.png has changed diff -r 73246d25dfe1 -r 8461f0cef2e6 share/hedgewars/Data/Themes/Brick/spray3.png Binary file share/hedgewars/Data/Themes/Brick/spray3.png has changed diff -r 73246d25dfe1 -r 8461f0cef2e6 share/hedgewars/Data/Themes/Stage/Bass.png Binary file share/hedgewars/Data/Themes/Stage/Bass.png has changed diff -r 73246d25dfe1 -r 8461f0cef2e6 share/hedgewars/Data/Themes/Stage/BlueWater.png Binary file share/hedgewars/Data/Themes/Stage/BlueWater.png has changed diff -r 73246d25dfe1 -r 8461f0cef2e6 share/hedgewars/Data/Themes/Stage/Box.png Binary file share/hedgewars/Data/Themes/Stage/Box.png has changed diff -r 73246d25dfe1 -r 8461f0cef2e6 share/hedgewars/Data/Themes/Stage/Chunk.png Binary file share/hedgewars/Data/Themes/Stage/Chunk.png has changed diff -r 73246d25dfe1 -r 8461f0cef2e6 share/hedgewars/Data/Themes/Stage/Droplet.png Binary file share/hedgewars/Data/Themes/Stage/Droplet.png has changed diff -r 73246d25dfe1 -r 8461f0cef2e6 share/hedgewars/Data/Themes/Stage/Flake.png Binary file share/hedgewars/Data/Themes/Stage/Flake.png has changed diff -r 73246d25dfe1 -r 8461f0cef2e6 share/hedgewars/Data/Themes/Stage/Girder.png Binary file share/hedgewars/Data/Themes/Stage/Girder.png has changed diff -r 73246d25dfe1 -r 8461f0cef2e6 share/hedgewars/Data/Themes/Stage/LandBackTex.png Binary file share/hedgewars/Data/Themes/Stage/LandBackTex.png has changed diff -r 73246d25dfe1 -r 8461f0cef2e6 share/hedgewars/Data/Themes/Stage/LandTex.png Binary file share/hedgewars/Data/Themes/Stage/LandTex.png has changed diff -r 73246d25dfe1 -r 8461f0cef2e6 share/hedgewars/Data/Themes/Stage/Light.png Binary file share/hedgewars/Data/Themes/Stage/Light.png has changed diff -r 73246d25dfe1 -r 8461f0cef2e6 share/hedgewars/Data/Themes/Stage/MicL.png Binary file share/hedgewars/Data/Themes/Stage/MicL.png has changed diff -r 73246d25dfe1 -r 8461f0cef2e6 share/hedgewars/Data/Themes/Stage/MicR.png Binary file share/hedgewars/Data/Themes/Stage/MicR.png has changed diff -r 73246d25dfe1 -r 8461f0cef2e6 share/hedgewars/Data/Themes/Stage/Sky.png Binary file share/hedgewars/Data/Themes/Stage/Sky.png has changed diff -r 73246d25dfe1 -r 8461f0cef2e6 share/hedgewars/Data/Themes/Stage/SkyL.png Binary file share/hedgewars/Data/Themes/Stage/SkyL.png has changed diff -r 73246d25dfe1 -r 8461f0cef2e6 share/hedgewars/Data/Themes/Stage/SkyR.png Binary file share/hedgewars/Data/Themes/Stage/SkyR.png has changed diff -r 73246d25dfe1 -r 8461f0cef2e6 share/hedgewars/Data/Themes/Stage/Splash.png Binary file share/hedgewars/Data/Themes/Stage/Splash.png has changed diff -r 73246d25dfe1 -r 8461f0cef2e6 share/hedgewars/Data/Themes/Stage/drum.png Binary file share/hedgewars/Data/Themes/Stage/drum.png has changed diff -r 73246d25dfe1 -r 8461f0cef2e6 share/hedgewars/Data/Themes/Stage/horizont.png Binary file share/hedgewars/Data/Themes/Stage/horizont.png has changed diff -r 73246d25dfe1 -r 8461f0cef2e6 share/hedgewars/Data/Themes/Stage/icon.png Binary file share/hedgewars/Data/Themes/Stage/icon.png has changed diff -r 73246d25dfe1 -r 8461f0cef2e6 share/hedgewars/Data/Themes/Stage/poster1.png Binary file share/hedgewars/Data/Themes/Stage/poster1.png has changed diff -r 73246d25dfe1 -r 8461f0cef2e6 share/hedgewars/Data/Themes/Stage/poster2.png Binary file share/hedgewars/Data/Themes/Stage/poster2.png has changed diff -r 73246d25dfe1 -r 8461f0cef2e6 share/hedgewars/Data/Themes/Stage/poster3.png Binary file share/hedgewars/Data/Themes/Stage/poster3.png has changed diff -r 73246d25dfe1 -r 8461f0cef2e6 share/hedgewars/Data/Themes/Stage/poster4.png Binary file share/hedgewars/Data/Themes/Stage/poster4.png has changed