diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-03-14 23:46:06 +0100 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-03-15 00:18:50 +0100 |
| commit | a73e91c49c96f950bcd1892a738558cbbb523741 (patch) | |
| tree | cdeb775c08480323b8fd1e296b7d59beca59f45c /OpenPGP-Keychain-API/example-app | |
| parent | a9c9b6132c7b122f8155ce9fc6c21c89e5b8c298 (diff) | |
| parent | efab1d27ac7ffb9e39fe5acd8064c708dc588452 (diff) | |
| download | open-keychain-a73e91c49c96f950bcd1892a738558cbbb523741.tar.gz open-keychain-a73e91c49c96f950bcd1892a738558cbbb523741.tar.bz2 open-keychain-a73e91c49c96f950bcd1892a738558cbbb523741.zip | |
Merge branch 'master' into certs
Conflicts:
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyCertsFragment.java
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java
Diffstat (limited to 'OpenPGP-Keychain-API/example-app')
0 files changed, 0 insertions, 0 deletions