# HG changeset patch
# User antonc27 <antonc27@mail.ru>
# Date 1447594979 -3600
# Node ID 1ae8d4582e1e4d43adb0a76f24d4884e7164a997
# Parent  7038ecc1f7fa9c5d899ee9d8c43f937db858fc43# Parent  4bf720dcef017fdd6cdb9058d21597553faa5dce
Merge

diff -r 4bf720dcef01 -r 1ae8d4582e1e .hgtags
--- a/.hgtags	Sun Nov 15 14:18:59 2015 +0100
+++ b/.hgtags	Sun Nov 15 14:42:59 2015 +0100
@@ -70,3 +70,4 @@
 4c4f22cc3fa4e6c1e5cd6cce35350dd93478415f 0.9.22-release
 4c4f22cc3fa4e6c1e5cd6cce35350dd93478415f 0.9.22-release
 9621fdcad96589b3fd78713a0f31e72f26f068bb 0.9.22-release
+a0163b8302c592aac60d98134bb6730f390fcaad Hedgewars-iOS-2.0
diff -r 4bf720dcef01 -r 1ae8d4582e1e project_files/Android-build/SDL-android-project/assets/Data/Graphics/Buttons/forwardjump.png
Binary file project_files/Android-build/SDL-android-project/assets/Data/Graphics/Buttons/forwardjump.png has changed
diff -r 4bf720dcef01 -r 1ae8d4582e1e project_files/Android-build/SDL-android-project/assets/Data/Graphics/Buttons/forwardjump_old.png
Binary file project_files/Android-build/SDL-android-project/assets/Data/Graphics/Buttons/forwardjump_old.png has changed
diff -r 4bf720dcef01 -r 1ae8d4582e1e project_files/HedgewarsMobile/Classes/MissionTrainingViewController.m
--- a/project_files/HedgewarsMobile/Classes/MissionTrainingViewController.m	Sun Nov 15 14:18:59 2015 +0100
+++ b/project_files/HedgewarsMobile/Classes/MissionTrainingViewController.m	Sun Nov 15 14:42:59 2015 +0100
@@ -267,7 +267,6 @@
 
 -(void) didReceiveMemoryWarning
 {
-    self.previewImage = nil;
     self.missionName = nil;
     self.listOfMissionIDs = nil;
     self.dictOfMissions = nil;
diff -r 4bf720dcef01 -r 1ae8d4582e1e project_files/HedgewarsMobile/Classes/SchemeWeaponConfigViewController.m
--- a/project_files/HedgewarsMobile/Classes/SchemeWeaponConfigViewController.m	Sun Nov 15 14:18:59 2015 +0100
+++ b/project_files/HedgewarsMobile/Classes/SchemeWeaponConfigViewController.m	Sun Nov 15 14:42:59 2015 +0100
@@ -268,14 +268,14 @@
     footer.backgroundColor = [UIColor clearColor];
     footer.autoresizingMask = UIViewAutoresizingFlexibleWidth;
 
-    UILabel *label = [[UILabel alloc] initWithFrame:CGRectMake(0, 0, aTableView.frame.size.width*80/100, height)];
+    UILabel *label = [[UILabel alloc] initWithFrame:CGRectMake(0, 0, aTableView.frame.size.width*90/100, height)];
     label.center = CGPointMake(aTableView.frame.size.width/2, height/2);
     label.textAlignment = UITextAlignmentCenter;
     label.font = [UIFont italicSystemFontOfSize:12];
     label.textColor = [UIColor whiteColor];
     label.numberOfLines = 2;
     label.backgroundColor = [UIColor clearColor];
-    label.autoresizingMask = UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleRightMargin;
+    label.autoresizingMask = UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleRightMargin | UIViewAutoresizingFlexibleWidth;
 
     label.text = NSLocalizedString(@"Setting a Style might force a particular Scheme or Weapon configuration.",@"");
 
diff -r 4bf720dcef01 -r 1ae8d4582e1e project_files/HedgewarsMobile/Classes/TeamConfigViewController.m
--- a/project_files/HedgewarsMobile/Classes/TeamConfigViewController.m	Sun Nov 15 14:18:59 2015 +0100
+++ b/project_files/HedgewarsMobile/Classes/TeamConfigViewController.m	Sun Nov 15 14:42:59 2015 +0100
@@ -194,23 +194,23 @@
 }
 
 -(CGFloat) tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section {
-    return IS_IPAD() ? 40 : 20;
+    return IS_IPAD() ? 40 : 30;
 }
 
 -(UIView *)tableView:(UITableView *)aTableView viewForFooterInSection:(NSInteger) section {
-    NSInteger height = IS_IPAD() ? 40 : 20;
+    NSInteger height = IS_IPAD() ? 40 : 30;
     UIView *footer = [[UIView alloc] initWithFrame:CGRectMake(0, 0, aTableView.frame.size.width, height)];
     footer.backgroundColor = [UIColor clearColor];
     footer.autoresizingMask = UIViewAutoresizingFlexibleWidth;
 
-    UILabel *label = [[UILabel alloc] initWithFrame:CGRectMake(0, 0, aTableView.frame.size.width*80/100, height)];
+    UILabel *label = [[UILabel alloc] initWithFrame:CGRectMake(0, 0, aTableView.frame.size.width*90/100, height)];
     label.center = CGPointMake(aTableView.frame.size.width/2, height/2);
     label.textAlignment = UITextAlignmentCenter;
     label.font = [UIFont italicSystemFontOfSize:12];
     label.textColor = [UIColor whiteColor];
     label.numberOfLines = 2;
     label.backgroundColor = [UIColor clearColor];
-    label.autoresizingMask = UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleRightMargin;
+    label.autoresizingMask = UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleRightMargin | UIViewAutoresizingFlexibleWidth;
 
     if (section == 0)
         label.text = NSLocalizedString(@"Tap to add hogs or change color, touch and hold to remove a team.",@"");