Update version to 1.2.1

hrydgard · Feb 17, 2016 · 52eca3d · 52eca3d
1 parent 2a77ab7
commit 52eca3d
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/Blackberry/bar-descriptor.xml b/Blackberry/bar-descriptor.xml
@@ -3,7 +3,7 @@
     <id>com.Qtness.PPSSPP</id>
     <name>PPSSPP</name>
     <filename>PPSSPPBlackberry</filename>
-    <versionNumber>1.2.0</versionNumber>
+    <versionNumber>1.2.1</versionNumber>
     <buildId>1</buildId>
     <description>Playstation Portable emulator.</description>
 

diff --git a/Qt/Settings.pri b/Qt/Settings.pri
@@ -1,4 +1,4 @@
-VERSION = 1.2.0.0
+VERSION = 1.2.1.0
 DEFINES += USING_QT_UI USE_FFMPEG
 
 exists( /usr/include/snappy-c.h ) {

diff --git a/README.md b/README.md
@@ -18,6 +18,10 @@ For the latest source code, see [our github page](https://github.com/hrydgard/pp
 
 For build instructions and other development tutorials, see the [wiki](https://github.com/hrydgard/ppsspp/wiki).
 
+What's new in 1.2.1
+-------------------
+* Fixes for some crash-on-shutdown and app switching problems.
+
 What's new in 1.2.0
 -------------------
 * A major rework of sceAtrac audio decoding, fixing various music hangs and similar issues

diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.ppsspp.ppsspp"
     android:installLocation="auto"
-    android:versionCode="1200"
-    android:versionName="1.2.0.0">
+    android:versionCode="1210"
+    android:versionName="1.2.1.0">
 
     <uses-sdk
         android:minSdkVersion="9"