PeterCxy/open-keychain
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases 1 Wiki Activity
open-keychain/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service
History
Vincent Breitmoser 54bc874ce5 Merge remote-tracking branch 'origin/master' into external-test 
Conflicts:
	OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java
2014-07-11 21:00:26 +02:00
..
ContactSyncAdapterService.java Reset importDone at the beginning of sync 2014-06-18 17:06:46 +02:00
DummyAccountService.java Fix TAG in account service as well 2014-06-06 17:42:28 +02:00
KeychainIntentService.java SaveKeyringParcel: follow attribute m prefix coding guideline 2014-07-11 13:51:36 +02:00
KeychainIntentServiceHandler.java fix subkey addition 2014-07-02 15:03:28 +02:00
OperationResultParcel.java Merge remote-tracking branch 'origin/master' into external-test 2014-07-11 21:00:26 +02:00
OperationResults.java work on edit key 2014-06-30 22:01:17 +02:00
PassphraseCacheService.java Edit key: adding user ids 2014-07-02 15:10:50 +02:00
SaveKeyringParcel.java modifyKey: make SubkeyChange operations work 2014-07-11 15:20:16 +02:00