aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThialfihar <thialfihar@gmail.com>2010-04-24 18:10:53 +0000
committerThialfihar <thialfihar@gmail.com>2010-04-24 18:10:53 +0000
commitb01a47a115ae4288f6b6e2f642837cbad3fbeaf0 (patch)
tree7c2f304158c9705ae2f5b39e789f4068ab26692e
parentd8e89c88224d3e32e853fbb9c59a6fadb8d0f832 (diff)
downloadopen-keychain-b01a47a115ae4288f6b6e2f642837cbad3fbeaf0.tar.gz
open-keychain-b01a47a115ae4288f6b6e2f642837cbad3fbeaf0.tar.bz2
open-keychain-b01a47a115ae4288f6b6e2f642837cbad3fbeaf0.zip
set branch to next version, reset changelog
-rw-r--r--AndroidManifest.xml2
-rw-r--r--src/org/thialfihar/android/apg/Apg.java2
-rw-r--r--src/org/thialfihar/android/apg/MainActivity.java2
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" +