diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-04-03 13:43:28 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-04-03 14:56:35 +0200 |
| commit | 34fca975d764cfdda61ae30c31fbb0ce81807df6 (patch) | |
| tree | b766dadffa130607db9f400ff54158096c0471a4 /Resources/old extended service | |
| parent | a7eff41ced8b5622f6ed96a5b834677314ae7ca8 (diff) | |
| parent | 11b08c4d985854ded125d5a43e8a13207dee393d (diff) | |
| download | open-keychain-34fca975d764cfdda61ae30c31fbb0ce81807df6.tar.gz open-keychain-34fca975d764cfdda61ae30c31fbb0ce81807df6.tar.bz2 open-keychain-34fca975d764cfdda61ae30c31fbb0ce81807df6.zip | |
Merge remote-tracking branch 'origin/master' into db-overhaul
Conflicts:
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainContract.java
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.java
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyActivity.java
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectSecretKeyFragment.java
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectSecretKeyLayoutFragment.java
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
Diffstat (limited to 'Resources/old extended service')
0 files changed, 0 insertions, 0 deletions