From: Oskar Wiksten <oskar.wiksten@gmail.com>
Date: Mon, 22 Oct 2012 18:06:11 +0000 (+0200)
Subject: Bump version to v0.6.12b2.
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=7e3bfac5492c4d57e858bf8e6aa79e083e2b9ac0;p=users%2Fmchehab%2Fandors-trail.git

Bump version to v0.6.12b2.
---

diff --git a/AndorsTrail/AndroidManifest.xml b/AndorsTrail/AndroidManifest.xml
index d1b5181..cadc770 100644
--- a/AndorsTrail/AndroidManifest.xml
+++ b/AndorsTrail/AndroidManifest.xml
@@ -4,7 +4,7 @@
 	xmlns:android="http://schemas.android.com/apk/res/android" 
 	package="com.gpl.rpg.AndorsTrail"
 	android:versionCode="32"
-	android:versionName="0.6.12b1"
+	android:versionName="0.6.12b2"
 	android:installLocation="auto"
 	>
 	<uses-sdk 
diff --git a/AndorsTrail/res/values/strings.xml b/AndorsTrail/res/values/strings.xml
index d30ad77..8319951 100644
--- a/AndorsTrail/res/values/strings.xml
+++ b/AndorsTrail/res/values/strings.xml
@@ -504,6 +504,10 @@
     <string name="skill_longdescription_concussion">When making an attack on a target whose block chance (BC) is at least %1$d lower than your attack chance (AC), there is a %2$d %% chance that the hit will cause a concussion on the target. A concussion will severely lower the target\'s offensive combat abilities, making the target less able to land successful attacks.</string>
 
     <string name="about_button4">About</string>
+	
+	<!-- =========================================== -->
+	<!-- Added in v0.6.12 -->
+	
     <string name="preferences_ui_category">Interface</string>
     <string name="preferences_ui_enable_animations_title">Enable animations</string>
     <string name="preferences_ui_enable_animations">Show animations for various interface elements, such as the combat bar.</string>
@@ -512,9 +516,6 @@
     <string name="display_worldmap_not_available">The map cannot be displayed from this location.</string>
     <string name="display_worldmap_title">Map</string>
     
-	<!-- =========================================== -->
-	<!-- Added in v0.6.12 -->
-	
 	<string name="inventory_equip_offhand">Equip (offhand)</string>
 	
 	<string name="iteminfo_effect_weapon_attack_cost">Attack cost: %1$d AP</string>
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailApplication.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailApplication.java
index e3dfdef..74a6581 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailApplication.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailApplication.java
@@ -21,7 +21,7 @@ public final class AndorsTrailApplication extends Application {
 	public static final boolean DEVELOPMENT_DEBUGMESSAGES = false;
 	public static final boolean DEVELOPMENT_INCOMPATIBLE_SAVEGAMES = DEVELOPMENT_DEBUGRESOURCES;
 	public static final int CURRENT_VERSION = DEVELOPMENT_INCOMPATIBLE_SAVEGAMES ? 999 : 32;
-	public static final String CURRENT_VERSION_DISPLAY = "0.6.12b1";
+	public static final String CURRENT_VERSION_DISPLAY = "0.6.12b2";
 	
 	public final WorldContext world = new WorldContext();
 	public final WorldSetup setup = new WorldSetup(world, this);