cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'development' into v/crypto-input-parcel

Browse Source 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptOperation.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SafeSlingerActivity.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java
This commit is contained in:
Dominik Schürmann
2015-03-24 13:19:43 +01:00
parent c694d73cab eeccd7cd14
commit 040cf42cb0
235 changed files with 10182 additions and 8382 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
OpenKeychain/src/main/AndroidManifest.xml
View File

@@ -3,8 +3,8 @@
xmlns:tools="http://schemas.android.com/tools"
package="org.sufficientlysecure.keychain"
android:installLocation="auto"
android:versionCode="31202"
android:versionName="3.2beta2">
android:versionCode="31203"
android:versionName="3.2beta3">
<!--
General remarks
@@ -705,6 +705,9 @@
<service
android:name=".service.KeychainIntentService"
android:exported="false" />
<service
android:name=".service.CloudImportService"
android:exported="false" />
<provider
android:name=".provider.KeychainProvider"