From 963f206456747537dbbf0aed32bd7151d79672be Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Fri, 16 Aug 2013 03:57:09 +0200
Subject: [PATCH] Bump to version 0.9.9.6

---
 android/phoenix/AndroidManifest.xml          | 4 ++--
 android/phoenix/res/layout/faq_whats_new.xml | 5 +++++
 android/phoenix/res/xml/prefs.xml            | 2 +-
 dist-scripts/retroarch-CHANGELOG.txt         | 8 ++++++++
 general.h                                    | 4 ++--
 5 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/android/phoenix/AndroidManifest.xml b/android/phoenix/AndroidManifest.xml
index 4f6243d63f..60c19f7578 100644
--- a/android/phoenix/AndroidManifest.xml
+++ b/android/phoenix/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.retroarch"
-    android:versionCode="20"
-    android:versionName="0.9.9.5" >
+    android:versionCode="21"
+    android:versionName="0.9.9.6" >
 	<uses-feature android:glEsVersion="0x00020000" />
     <uses-feature android:name="android.hardware.touchscreen" android:required="false"/>
     <uses-sdk
diff --git a/android/phoenix/res/layout/faq_whats_new.xml b/android/phoenix/res/layout/faq_whats_new.xml
index 3dec74f5c8..7d7df4c389 100644
--- a/android/phoenix/res/layout/faq_whats_new.xml
+++ b/android/phoenix/res/layout/faq_whats_new.xml
@@ -10,6 +10,11 @@
         android:layout_height="wrap_content"
         android:layout_margin="40px"
         android:text="
+        r21 (August 16, 2013)\n\n
+        * [VBA Next] Fixes serious regressions - most evident in Golden Sun games -\n
+         battle screens etc.\n
+        * [VBA Next] Add a core option to change the control button layout from (left\n
+         to right) B to A to (left to right) A to B.\n
         r19 (August 15, 2013)\n\n
         * [Android] Input autodetection fixes -\n
          - DualShock3 pad controls fixed\n
diff --git a/android/phoenix/res/xml/prefs.xml b/android/phoenix/res/xml/prefs.xml
index 6a2ae26e9e..83b58c25b0 100644
--- a/android/phoenix/res/xml/prefs.xml
+++ b/android/phoenix/res/xml/prefs.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-    android:title="RetroArch 0.9.9.5 - Main Menu" >
+    android:title="RetroArch 0.9.9.6 - Main Menu" >
 
     <PreferenceScreen android:title="TV Mode">
        <intent
diff --git a/dist-scripts/retroarch-CHANGELOG.txt b/dist-scripts/retroarch-CHANGELOG.txt
index 8234786c06..8263a4e4c0 100644
--- a/dist-scripts/retroarch-CHANGELOG.txt
+++ b/dist-scripts/retroarch-CHANGELOG.txt
@@ -1,3 +1,11 @@
+------------------------------------------------------------------------------
+v0.9.9.6
+------------------------------------------------------------------------------
+* [VBA Next] Fixes serious regressions - most evident in Golden Sun games -
+battle screens etc.
+* [VBA Next] Add a core option to change the control button layout from (left
+to right) B to A to (left to right) A to B.
+
 ------------------------------------------------------------------------------
 v0.9.9.5
 ------------------------------------------------------------------------------
diff --git a/general.h b/general.h
index 0d662853be..702b8928f8 100644
--- a/general.h
+++ b/general.h
@@ -41,9 +41,9 @@
 #ifndef PACKAGE_VERSION
 #ifdef __QNX__
 /* FIXME - avoid too many decimal points in number error */
-#define PACKAGE_VERSION "0995"
+#define PACKAGE_VERSION "0996"
 #else
-#define PACKAGE_VERSION "0.9.9.5"
+#define PACKAGE_VERSION "0.9.9.6"
 #endif
 #endif