aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SubkeysAdapter.java
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into external-testVincent Breitmoser2014-07-111-46/+81
|\
| * Work on subkeys adapterDominik Schürmann2014-07-081-46/+81
|/
* fix nullpointer, cleanupDominik Schürmann2014-07-021-3/+2
* remove init methods from adapterDominik Schürmann2014-07-021-51/+30
* Rename adapterDominik Schürmann2014-06-221-0/+211