aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpConversionHelper.java
Commit message (Expand)AuthorAgeFilesLines
* Rename folder structure from OpenPGP Keychain to OpenKeychainDominik Schürmann2014-04-061-200/+0
* Merge remote-tracking branch 'origin/master' into certsVincent Breitmoser2014-04-051-6/+25
|\
| * Trivial spacing changes to conform to style guideThialfihar2014-04-021-4/+6
| * merge masterAshley Hughes2014-03-291-19/+19
| |\
| * | allow lists to be subkeys or keyringsAshley Hughes2014-03-251-6/+23
* | | Merge branch 'master' into certsVincent Breitmoser2014-03-151-16/+16
|\ \ \ | | |/ | |/|
| * | fix code style in /pgpuberspot2014-03-131-16/+16
* | | Merge branch 'master' into certsVincent Breitmoser2014-03-121-3/+3
|\| |
| * | removed useless semicolons, fixed some parameters in documenation, simplified...uberspot2014-03-071-3/+3
| |/
* / add view cert activityVincent Breitmoser2014-03-121-0/+24
|/
* create keys with minimal keyrings being constructed in betweenAshley Hughes2014-01-311-2/+20
* New Gradle project structureDominik Schürmann2014-01-271-0/+139