Commit Graph

4 Commits

Author SHA1 Message Date
cketti 82736f3a8b Merge pull request #524 from k9mail/merge_pgp_mime_branch
Merge changes from PGP/MIME repository
2015-01-02 22:04:28 +01:00
Jan Berkel fe8e779b32 Reformat 2014-12-23 10:15:24 +01:00
cketti 4f8fc5bc5b Merge remote-tracking branch 'k9mail_pgp_mime/master'
Fixed lots of conflicts
2014-12-20 08:07:46 +01:00
cketti 7d3cea87f9 Use default directory structure for tests-on-jvm subproject 2014-12-20 00:10:38 +01:00