aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java
Commit message (Expand)AuthorAgeFilesLines
...
* Merge branch 'master' into yubikeyDominik Schürmann2014-08-281-0/+1
|\
| * Copyright (C) 2014 Vincent BreitmoserVincent Breitmoser2014-08-211-0/+1
* | Support for multiple hash algosDominik Schürmann2014-08-141-11/+21
* | Merge branch 'master' into yubikeyDominik Schürmann2014-08-061-0/+17
|\|
| * Add license headersDominik Schürmann2014-08-041-0/+17
* | Merge branch 'master' into yubikeyDominik Schürmann2014-08-011-37/+84
|/
* rename Wrapped*Key* to Canonicalized*Key*Vincent Breitmoser2014-07-311-0/+192