diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-03-12 18:05:28 +0100 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-03-12 18:05:28 +0100 |
| commit | 69f5bf6b577234053e700a43a4a7ba721e827c6a (patch) | |
| tree | 65ebb2ab3a40508e3d97c10ac9ca87aa43da7691 /libraries/AndroidBootstrap/src | |
| parent | a9e5619a14f5cef4e0211d56c000b0e853120f1d (diff) | |
| parent | be558944b52ac038c40bdf84a3d52c9ae2e7a218 (diff) | |
| download | open-keychain-69f5bf6b577234053e700a43a4a7ba721e827c6a.tar.gz open-keychain-69f5bf6b577234053e700a43a4a7ba721e827c6a.tar.bz2 open-keychain-69f5bf6b577234053e700a43a4a7ba721e827c6a.zip | |
Merge branch 'unified-keylist'
Conflicts:
OpenPGP-Keychain/src/main/AndroidManifest.xml
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListPublicFragment.java
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListSecretActivity.java
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListSecretFragment.java
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyListPublicAdapter.java
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyListSecretAdapter.java
OpenPGP-Keychain/src/main/res/layout/key_list_secret_item.xml
OpenPGP-Keychain/src/main/res/menu/key_list.xml
OpenPGP-Keychain/src/main/res/menu/key_list_multi.xml
OpenPGP-Keychain/src/main/res/menu/key_list_secret_multi.xml
Diffstat (limited to 'libraries/AndroidBootstrap/src')
0 files changed, 0 insertions, 0 deletions