aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringMergeTest.java
Commit message (Collapse)AuthorAgeFilesLines
* move around package structure a bitVincent Breitmoser2014-10-101-2/+2
|
* work on OperationResultParcelVincent Breitmoser2014-09-141-4/+4
|
* Fix testsDominik Schürmann2014-09-131-1/+2
|
* promote all result parcels to top level classes in their own packageVincent Breitmoser2014-09-131-6/+2
|
* merge: adapt testcase to previous commitVincent Breitmoser2014-09-111-9/+41
|
* Fix testDominik Schürmann2014-09-081-1/+1
|
* Revert "Fix test"Dominik Schürmann2014-09-081-1/+1
| | | | This reverts commit f392d95ac34361ac9b38f9f39baf57500717e665.
* Fix testDominik Schürmann2014-09-081-1/+1
|
* add ecc supportVincent Breitmoser2014-08-241-4/+5
|
* Copyright (C) 2014 Vincent BreitmoserVincent Breitmoser2014-08-211-0/+1
|
* Add license headersDominik Schürmann2014-08-191-0/+17
|
* fix travis tests (more), minor comment editsVincent Breitmoser2014-08-161-0/+3
|
* support for master key modifications, among other stuffVincent Breitmoser2014-08-161-4/+4
|
* Fix testsDominik Schürmann2014-08-131-4/+5
|
* move classes around a bitVincent Breitmoser2014-08-011-0/+390