diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-06-18 21:09:04 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-06-18 21:09:04 +0200 |
| commit | 5f20b8de1a052d366e5dcb24f2539062ae903156 (patch) | |
| tree | e069499d3c045e45d8c7126fe3688544f4b28622 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java | |
| parent | 3bffe4da559d0ee45c44df1afee6d5b4de9b89d1 (diff) | |
| parent | 4bff50bffc43c23e08f87ff7c5b19fe790874d01 (diff) | |
| download | open-keychain-5f20b8de1a052d366e5dcb24f2539062ae903156.tar.gz open-keychain-5f20b8de1a052d366e5dcb24f2539062ae903156.tar.bz2 open-keychain-5f20b8de1a052d366e5dcb24f2539062ae903156.zip | |
Merge branch 'new-edit'
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java
OpenKeychain/src/main/res/values/strings.xml
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java')
0 files changed, 0 insertions, 0 deletions