diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-12-04 19:43:41 +0100 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-12-04 19:43:41 +0100 |
| commit | 389d191448a3caf6d809552e9af63a62b9695bd3 (patch) | |
| tree | f048ab23f812a5472ec17944dd2e7e9683253f5e /OpenKeychain | |
| parent | a805069c59586775fd5790c00cbd82f4dfeddcb6 (diff) | |
| parent | 8f5295f2d13e895490813c0ced19cfd738e591ac (diff) | |
| download | open-keychain-389d191448a3caf6d809552e9af63a62b9695bd3.tar.gz open-keychain-389d191448a3caf6d809552e9af63a62b9695bd3.tar.bz2 open-keychain-389d191448a3caf6d809552e9af63a62b9695bd3.zip | |
Merge branch 'master' into development
Diffstat (limited to 'OpenKeychain')
| -rw-r--r-- | OpenKeychain/src/main/AndroidManifest.xml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml index 18fcc4b42..100f584c1 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 @@ -15,7 +15,7 @@ Association of file types to Keychain ===================================== General remarks about file ending conventions: - - *.gpg for binary files + - *.gpg for binary files - *.asc for ascii armored files The actual content can be anything. The file ending only shows if it is binary or ascii encoded. |