# HG changeset patch
# User unc0rr
# Date 1277556962 -14400
# Node ID 48452ee0c9253995005d326c79aa9ec8a1082df3
# Parent  7f8e07e4a4e38a7bfa8d3dd0b1b44a703d220d3d
merge

diff -r 7f8e07e4a4e3 -r 48452ee0c925 project_files/HedgewarsMobile/Hedgewars.xcodeproj/project.pbxproj
diff -r 7f8e07e4a4e3 -r 48452ee0c925 share/hedgewars/Data/Themes/Sheep/Border.png
diff -r 7f8e07e4a4e3 -r 48452ee0c925 share/hedgewars/Data/Themes/Sheep/Clouds.png
diff -r 7f8e07e4a4e3 -r 48452ee0c925 share/hedgewars/Data/Themes/Sheep/Flake.png
diff -r 7f8e07e4a4e3 -r 48452ee0c925 share/hedgewars/Data/Themes/Sheep/barriere.png
diff -r 7f8e07e4a4e3 -r 48452ee0c925 share/hedgewars/Data/Themes/Sheep/fleur.png
diff -r 7f8e07e4a4e3 -r 48452ee0c925 share/hedgewars/Data/Themes/Sheep/fleurland.png
diff -r 7f8e07e4a4e3 -r 48452ee0c925 share/hedgewars/Data/Themes/Sheep/fleurland2.png
diff -r 7f8e07e4a4e3 -r 48452ee0c925 share/hedgewars/Data/Themes/Sheep/fleurland3.png
diff -r 7f8e07e4a4e3 -r 48452ee0c925 share/hedgewars/Data/Themes/Sheep/grass.png
diff -r 7f8e07e4a4e3 -r 48452ee0c925 share/hedgewars/Data/Themes/Sheep/grass2.png
diff -r 7f8e07e4a4e3 -r 48452ee0c925 share/hedgewars/Data/Themes/Sheep/mouton1.png
diff -r 7f8e07e4a4e3 -r 48452ee0c925 share/hedgewars/Data/Themes/Sheep/mouton2.png
diff -r 7f8e07e4a4e3 -r 48452ee0c925 share/hedgewars/Data/Themes/Sheep/mouton3.png
diff -r 7f8e07e4a4e3 -r 48452ee0c925 share/hedgewars/Data/Themes/Sheep/mouton4.png
diff -r 7f8e07e4a4e3 -r 48452ee0c925 share/hedgewars/Data/Themes/Sheep/rocher.png