From b01a47a115ae4288f6b6e2f642837cbad3fbeaf0 Mon Sep 17 00:00:00 2001
From: Thialfihar <thialfihar@gmail.com>
Date: Sat, 24 Apr 2010 18:10:53 +0000
Subject: [PATCH] set branch to next version, reset changelog

---
 AndroidManifest.xml                              | 2 +-
 src/org/thialfihar/android/apg/Apg.java          | 2 +-
 src/org/thialfihar/android/apg/MainActivity.java | 2 --
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 82663318f..5ed0b9cf9 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -17,7 +17,7 @@
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.thialfihar.android.apg"
-    android:versionName="0.9.1" android:versionCode="6">
+    android:versionName="0.9.2" android:versionCode="7">
 
     <application
         android:icon="@drawable/icon"
diff --git a/src/org/thialfihar/android/apg/Apg.java b/src/org/thialfihar/android/apg/Apg.java
index 4257c2afb..16c743676 100644
--- a/src/org/thialfihar/android/apg/Apg.java
+++ b/src/org/thialfihar/android/apg/Apg.java
@@ -104,7 +104,7 @@ public class Apg {
         public static final String ENCRYPT_FILE = "org.thialfihar.android.apg.intent.ENCRYPT_FILE";
     }
 
-    public static String VERSION = "0.9.1";
+    public static String VERSION = "0.9.2";
     public static String FULL_VERSION = "APG v" + VERSION;
 
     private static final int[] PREFERRED_SYMMETRIC_ALGORITHMS =
diff --git a/src/org/thialfihar/android/apg/MainActivity.java b/src/org/thialfihar/android/apg/MainActivity.java
index 92e9bcfd2..33d79ecda 100644
--- a/src/org/thialfihar/android/apg/MainActivity.java
+++ b/src/org/thialfihar/android/apg/MainActivity.java
@@ -222,8 +222,6 @@ public class MainActivity extends BaseActivity {
                 SpannableString info =
                         new SpannableString("Read the warnings!\n\n" +
                                             "Changes:\n" +
-                                            "* ElGamal subkey support\n" +
-                                            "* bug fixes\n" +
                                             "\n" +
                                             "WARNING: be careful editing your existing keys, as they " +
                                             "WILL be stripped of certificates right now.\n" +