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-011-37/+84
|/
* rename Wrapped*Key* to Canonicalized*Key*Vincent Breitmoser2014-07-311-0/+192