diff options
| author | Tim Bray <tbray@textuality.com> | 2014-11-19 14:37:06 -0800 |
|---|---|---|
| committer | Tim Bray <tbray@textuality.com> | 2014-11-19 14:37:06 -0800 |
| commit | 629d83a1ceedefe42f6e763af2065033f3fe77ae (patch) | |
| tree | b2f8ecd92f86e26dbd3c221ed796673e918e5e77 | |
| parent | b5cdeb7f5a54be7443894ca2cb4bd27359fae9ce (diff) | |
| parent | 1c0f994d082bde6d6b0a6783e8d81a1d80d86a23 (diff) | |
| download | open-keychain-629d83a1ceedefe42f6e763af2065033f3fe77ae.tar.gz open-keychain-629d83a1ceedefe42f6e763af2065033f3fe77ae.tar.bz2 open-keychain-629d83a1ceedefe42f6e763af2065033f3fe77ae.zip | |
Merge branch 'keybase-proofs' of https://github.com/open-keychain/open-keychain into keybase-proofs
| -rw-r--r-- | OpenKeychain/src/main/AndroidManifest.xml | 4 | ||||
| m--------- | extern/KeybaseLib | 0 | ||||
| m--------- | extern/minidns | 0 |
3 files changed, 2 insertions, 2 deletions
diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml index 18fcc4b42..3af0bdf6c 100644 --- a/OpenKeychain/src/main/AndroidManifest.xml +++ b/OpenKeychain/src/main/AndroidManifest.xml @@ -3,8 +3,8 @@ xmlns:tools="http://schemas.android.com/tools" package="org.sufficientlysecure.keychain" android:installLocation="auto" - android:versionCode="31200" - android:versionName="3.1.2"> + android:versionCode="31201" + android:versionName="3.2beta1"> <!-- General remarks diff --git a/extern/KeybaseLib b/extern/KeybaseLib -Subproject 70c2f33e26d3988a23524935810bcfe754b85a6 +Subproject 7f4980f0789d7bb3c2124080f32b3bec703c576 diff --git a/extern/minidns b/extern/minidns -Subproject 9e42bff01440c1351946a432126d5a1b87fb7c7 +Subproject 118fefcaaa44a7f31f5c18fa7e477f1665f654b |