From 5372897bae9c4539bf2f7ec5fe4b67b7858ec64c Mon Sep 17 00:00:00 2001
From: Thomas Guillem <thomas@gllm.fr>
Date: Thu, 9 Apr 2015 17:30:29 +0200
Subject: [PATCH] On the road to 1.2.6

---
 NEWS                            | 7 ++++++-
 vlc-android/AndroidManifest.xml | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index 7f8330fcd..903e57add 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,11 @@
-Changes between 1.2.5 and 1.3.0:
+Changes between 1.2.5 and 1.2.6:
 --------------------------------
 
+Application:
+ * Fix crash on startup when some iso files
+ * Fix presentation mode
+ * New audio material design icons
+ * Minor bug fixes
 
 Changes between 1.2.4 and 1.2.5:
 --------------------------------
diff --git a/vlc-android/AndroidManifest.xml b/vlc-android/AndroidManifest.xml
index f46fdf598..d8719db47 100644
--- a/vlc-android/AndroidManifest.xml
+++ b/vlc-android/AndroidManifest.xml
@@ -3,7 +3,7 @@
     package="org.videolan.vlc"
     android:installLocation="auto"
     android:versionCode="01030000"
-    android:versionName="1.3.0" >
+    android:versionName="1.2.6" >
     <!--
          versionCode scheme is T M NN RR AA
          T: Target/Flavour (0 for Android, 1 for ATV, 2 for Chrome?)
-- 
GitLab