| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | move around package structure a bit | Vincent Breitmoser | 2014-10-10 | 1 | -2/+2 |
| * | work on OperationResultParcel | Vincent Breitmoser | 2014-09-14 | 1 | -4/+4 |
| * | Fix tests | Dominik Schürmann | 2014-09-13 | 1 | -1/+2 |
| * | promote all result parcels to top level classes in their own package | Vincent Breitmoser | 2014-09-13 | 1 | -6/+2 |
| * | merge: adapt testcase to previous commit | Vincent Breitmoser | 2014-09-11 | 1 | -9/+41 |
| * | Fix test | Dominik Schürmann | 2014-09-08 | 1 | -1/+1 |
| * | Revert "Fix test" | Dominik Schürmann | 2014-09-08 | 1 | -1/+1 |
| * | Fix test | Dominik Schürmann | 2014-09-08 | 1 | -1/+1 |
| * | add ecc support | Vincent Breitmoser | 2014-08-24 | 1 | -4/+5 |
| * | Copyright (C) 2014 Vincent Breitmoser | Vincent Breitmoser | 2014-08-21 | 1 | -0/+1 |
| * | Add license headers | Dominik Schürmann | 2014-08-19 | 1 | -0/+17 |
| * | fix travis tests (more), minor comment edits | Vincent Breitmoser | 2014-08-16 | 1 | -0/+3 |
| * | support for master key modifications, among other stuff | Vincent Breitmoser | 2014-08-16 | 1 | -4/+4 |
| * | Fix tests | Dominik Schürmann | 2014-08-13 | 1 | -4/+5 |
| * | move classes around a bit | Vincent Breitmoser | 2014-08-01 | 1 | -0/+390 |
 |
index : connectbot-yubikey/open-keychain | |
| open-keychain with patches to support ssh authentication | James |
| aboutsummaryrefslogtreecommitdiffstats |
path: root/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringMergeTest.java