From a1e74d0d4f89ba3fa2d4fe64bac7a0fa16fc146f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= <hrydgard@gmail.com>
Date: Tue, 5 Dec 2017 14:51:51 +0100
Subject: [PATCH] v1.5.4

---
 README.md                   | 4 ++++
 android/AndroidManifest.xml | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index a850967b68..d51c769619 100644
--- a/README.md
+++ b/README.md
@@ -19,6 +19,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.5.4
+-------------------
+* Bugfixes and crashfixes!
+
 What's new in 1.5.0
 -------------------
 * Full Vulkan support, also for Android now. Very fast on supported devices. (#10033, #10049)
diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index f4db4a5280..cc2938f5c5 100644
--- 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="15030000"
-    android:versionName="1.5.3.0">
+    android:versionCode="15040000"
+    android:versionName="1.5.4.0">
     <!-- Note that versionCode should be in the format xyzzrrrr -->
 
     <uses-sdk