Mercurial Mercurial > hedgewars / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
authorsmaxx
Sun, 01 Aug 2010 22:08:07 +0200
changeset 3702 6c90190908b6
parent 3700 fabf387d9055 (diff)
parent 3699 e5e2cbc90891 (current diff)
child 3704 ed2b9c7fb260
merge
--- 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
Binary file share/hedgewars/Data/Themes/Art/Chunk.png has changed
Binary file share/hedgewars/Data/Themes/Bamboo/Chunk.png has changed
Binary file share/hedgewars/Data/Themes/Bath/Chunk.png has changed
Binary file share/hedgewars/Data/Themes/Brick/Chunk.png has changed
Binary file share/hedgewars/Data/Themes/Castle/Chunk.png has changed
Binary file share/hedgewars/Data/Themes/Cheese/Chunk.png has changed
Binary file share/hedgewars/Data/Themes/City/Chunk.png has changed
Binary file share/hedgewars/Data/Themes/Compost/Chunk.png has changed
Binary file share/hedgewars/Data/Themes/Desert/Chunk.png has changed
Binary file share/hedgewars/Data/Themes/EarthRise/Chunk.png has changed
Binary file share/hedgewars/Data/Themes/Freeway/Chunk.png has changed
Binary file share/hedgewars/Data/Themes/Halloween/Chunk.png has changed
Binary file share/hedgewars/Data/Themes/Hell/Chunk.png has changed
Binary file share/hedgewars/Data/Themes/Island/Chunk.png has changed
Binary file share/hedgewars/Data/Themes/Nature/Chunk.png has changed
Binary file share/hedgewars/Data/Themes/Sheep/Chunk.png has changed
Binary file share/hedgewars/Data/Themes/Snow/Chunk.png has changed
Binary file share/hedgewars/Data/Themes/Stage/Chunk.png has changed
Binary file share/hedgewars/Data/Themes/Underwater/Chunk.png has changed
hedgewars