# HG changeset patch
# User smaxx
# Date 1280693287 -7200
# Node ID 6c90190908b6b639e6e0f848b6a304f41d0b4faa
# Parent  fabf387d905563cfb513420a3a2b6ecc278ea3e9# Parent  e5e2cbc90891406c3c1525bb3ec948f6411b77e8
merge

diff -r e5e2cbc90891 -r 6c90190908b6 .hgignore
--- a/.hgignore	Sun Aug 01 09:17:59 2010 -0400
+++ b/.hgignore	Sun Aug 01 22:08:07 2010 +0200
@@ -22,3 +22,4 @@
 glob:project_files/HedgewarsMobile/Data/
 glob:project_files/HedgewarsMobile/build/
 glob:project_files/HedgewarsMobile/Hedgewars.xcodeproj/vittorio.*
+glob:moc_*.cxx_parameters
diff -r e5e2cbc90891 -r 6c90190908b6 share/hedgewars/Data/Themes/Art/Chunk.png
Binary file share/hedgewars/Data/Themes/Art/Chunk.png has changed
diff -r e5e2cbc90891 -r 6c90190908b6 share/hedgewars/Data/Themes/Bamboo/Chunk.png
Binary file share/hedgewars/Data/Themes/Bamboo/Chunk.png has changed
diff -r e5e2cbc90891 -r 6c90190908b6 share/hedgewars/Data/Themes/Bath/Chunk.png
Binary file share/hedgewars/Data/Themes/Bath/Chunk.png has changed
diff -r e5e2cbc90891 -r 6c90190908b6 share/hedgewars/Data/Themes/Brick/Chunk.png
Binary file share/hedgewars/Data/Themes/Brick/Chunk.png has changed
diff -r e5e2cbc90891 -r 6c90190908b6 share/hedgewars/Data/Themes/Castle/Chunk.png
Binary file share/hedgewars/Data/Themes/Castle/Chunk.png has changed
diff -r e5e2cbc90891 -r 6c90190908b6 share/hedgewars/Data/Themes/Cheese/Chunk.png
Binary file share/hedgewars/Data/Themes/Cheese/Chunk.png has changed
diff -r e5e2cbc90891 -r 6c90190908b6 share/hedgewars/Data/Themes/City/Chunk.png
Binary file share/hedgewars/Data/Themes/City/Chunk.png has changed
diff -r e5e2cbc90891 -r 6c90190908b6 share/hedgewars/Data/Themes/Compost/Chunk.png
Binary file share/hedgewars/Data/Themes/Compost/Chunk.png has changed
diff -r e5e2cbc90891 -r 6c90190908b6 share/hedgewars/Data/Themes/Desert/Chunk.png
Binary file share/hedgewars/Data/Themes/Desert/Chunk.png has changed
diff -r e5e2cbc90891 -r 6c90190908b6 share/hedgewars/Data/Themes/EarthRise/Chunk.png
Binary file share/hedgewars/Data/Themes/EarthRise/Chunk.png has changed
diff -r e5e2cbc90891 -r 6c90190908b6 share/hedgewars/Data/Themes/Freeway/Chunk.png
Binary file share/hedgewars/Data/Themes/Freeway/Chunk.png has changed
diff -r e5e2cbc90891 -r 6c90190908b6 share/hedgewars/Data/Themes/Halloween/Chunk.png
Binary file share/hedgewars/Data/Themes/Halloween/Chunk.png has changed
diff -r e5e2cbc90891 -r 6c90190908b6 share/hedgewars/Data/Themes/Hell/Chunk.png
Binary file share/hedgewars/Data/Themes/Hell/Chunk.png has changed
diff -r e5e2cbc90891 -r 6c90190908b6 share/hedgewars/Data/Themes/Island/Chunk.png
Binary file share/hedgewars/Data/Themes/Island/Chunk.png has changed
diff -r e5e2cbc90891 -r 6c90190908b6 share/hedgewars/Data/Themes/Nature/Chunk.png
Binary file share/hedgewars/Data/Themes/Nature/Chunk.png has changed
diff -r e5e2cbc90891 -r 6c90190908b6 share/hedgewars/Data/Themes/Sheep/Chunk.png
Binary file share/hedgewars/Data/Themes/Sheep/Chunk.png has changed
diff -r e5e2cbc90891 -r 6c90190908b6 share/hedgewars/Data/Themes/Snow/Chunk.png
Binary file share/hedgewars/Data/Themes/Snow/Chunk.png has changed
diff -r e5e2cbc90891 -r 6c90190908b6 share/hedgewars/Data/Themes/Stage/Chunk.png
Binary file share/hedgewars/Data/Themes/Stage/Chunk.png has changed
diff -r e5e2cbc90891 -r 6c90190908b6 share/hedgewars/Data/Themes/Underwater/Chunk.png
Binary file share/hedgewars/Data/Themes/Underwater/Chunk.png has changed