Dominik Schürmann 8dddc82f69 Merge branch 'development' of github.com:open-keychain/open-keychain into development		2014-10-25 22:25:14 +02:00
..
compatibility	Update license header for 2014	2014-04-13 17:27:22 +02:00
keyimport	integrate download from keyserver into key import operation	2014-10-23 23:29:40 +02:00
operations	remove unnecessary (and buggy) BufferedInputStream wrapping	2014-10-25 22:20:55 +02:00
pgp	remove unnecessary (and buggy) BufferedInputStream wrapping	2014-10-25 22:20:55 +02:00
provider	change the way merging is logged	2014-10-25 02:45:16 +02:00
remote	Fixes and icons for apps list, also add Password Store	2014-10-25 21:15:05 +02:00
service	integrate download from keyserver into key import operation	2014-10-23 23:29:40 +02:00
ui	Merge branch 'development' of github.com:open-keychain/open-keychain into development	2014-10-25 22:25:14 +02:00
util	integrate download from keyserver into key import operation	2014-10-23 23:29:40 +02:00
Constants.java	Added option for num keypad for YubiKey	2014-10-13 04:47:48 +02:00
KeychainApplication.java	Fix crash on Android 5	2014-10-22 23:28:13 +02:00