Daniel Albert df9af316b4 Merge branch 'master' of https://github.com/open-keychain/open-keychain		2014-06-30 19:09:56 +02:00
..
compatibility	Update license header for 2014	2014-04-13 17:27:22 +02:00
helper	Magic to find possible mails and names of device owner	2014-06-28 00:05:12 +02:00
keyimport	Move sks-keyservers.net CA into assets folder	2014-06-25 00:37:01 +02:00
pgp	fix nullpointerexception in importkeyactivity	2014-06-28 20:54:13 +02:00
provider	pass import results through to viewkeyactivity on update	2014-06-28 20:54:14 +02:00
remote	Added new button style and converted account_settings and the select_secret_key_layout to use it	2014-06-29 13:59:51 +02:00
service	pass import results through to viewkeyactivity on update	2014-06-28 20:54:14 +02:00
testsupport	borrow tests from Haskell OpenPGP	2014-06-23 17:54:27 +01:00
ui	Merge branch 'master' of https://github.com/open-keychain/open-keychain	2014-06-30 19:09:56 +02:00
util	Moved Keybase stuff into KeybaseLib submodule	2014-06-20 09:31:34 -07:00
Constants.java	Move sks-keyservers.net CA into assets folder	2014-06-25 00:37:01 +02:00
KeychainApplication.java	Move sks-keyservers.net CA into assets folder	2014-06-25 00:37:01 +02:00