Vincent Breitmoser 5f20b8de1a 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		2014-06-18 21:09:04 +02:00
..
adapter
dialog
widget
CertifyKeyActivity.java
DecryptActivity.java
DecryptFileFragment.java
DecryptFragment.java
DecryptMessageFragment.java
DrawerActivity.java
EditKeyActivity.java
EncryptActivity.java
EncryptActivityInterface.java
EncryptAsymmetricFragment.java
EncryptFileFragment.java
EncryptMessageFragment.java
EncryptSymmetricFragment.java
HelpAboutFragment.java
HelpActivity.java
HelpHtmlFragment.java
ImportKeysActivity.java
ImportKeysFileFragment.java
ImportKeysKeybaseFragment.java
ImportKeysListFragment.java
ImportKeysQrCodeFragment.java
ImportKeysServerFragment.java
KeyListActivity.java
KeyListFragment.java
LoaderFragment.java
LogDisplayActivity.java
LogDisplayFragment.java
PreferencesActivity.java
PreferencesKeyServerActivity.java
SelectPublicKeyActivity.java
SelectPublicKeyFragment.java
SelectSecretKeyActivity.java
SelectSecretKeyFragment.java
SelectSecretKeyLayoutFragment.java
UploadKeyActivity.java
ViewCertActivity.java
ViewKeyActivity.java
ViewKeyCertsFragment.java
ViewKeyKeysFragment.java
ViewKeyMainFragment.java
ViewKeyShareFragment.java