connectbot-yubikey/open-keychain - open-keychain with patches to support ssh authentication

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'master' into improve-file-more	mar-v-in	2014-07-31	1	-1/+0
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: .gitmodules OpenKeychain/build.gradle OpenKeychain/src/main/AndroidManifest.xml OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/CachedPublicKeyRing.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFileFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptMessageFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptMessageFragment.java
\| *	get rid of AppMsg library	Vincent Breitmoser	2014-07-07	1	-1/+0
\| \|
* \|	Add TokenAutoComplete to gradle	mar-v-in	2014-07-15	1	-0/+1
\|/
*	Deprecated Android Bootstrap, thus fixing #597	Daniel Albert	2014-06-30	1	-1/+0
\|
*	Switch to dnsjava	mar-v-in	2014-06-23	1	-1/+1
\|
*	Moved Keybase stuff into KeybaseLib submodule	Tim Bray	2014-06-20	1	-0/+1
\|
*	Merge remote-tracking branch 'origin/master' into canonicalize	Vincent Breitmoser	2014-06-13	1	-0/+1
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: .gitmodules OpenKeychain/build.gradle OpenKeychain/src/main/AndroidManifest.xml OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysListEntry.java OpenKeychain/src/main/res/values/strings.xml settings.gradle
\| *	Add dnsjava as submodule	mar-v-in	2014-06-05	1	-0/+1
\| \|
* \|	import-log: add SuperToast external library	Vincent Breitmoser	2014-06-10	1	-0/+1
\|/
*	Move API libs and API example into their own git repos	Dominik Schürmann	2014-05-07	1	-2/+2
\|
*	Use git submodules for libs, fix compilation, remove library sourcecode	Dominik Schürmann	2014-04-16	1	-10/+10
\|
*	Rename folder structure from OpenPGP Keychain to OpenKeychain	Dominik Schürmann	2014-04-06	1	-3/+3
\|
*	Split api libs into OpenKeychain specific and OpenPGP Provider lib	Dominik Schürmann	2014-03-07	1	-1/+2
\|
*	remove dublication of api library, let both proejcts depend on the same	Dominik Schürmann	2014-02-27	1	-1/+1
\|
*	Added AppMsg library	Daniel Haß	2014-02-20	1	-0/+1
\|
*	Restructuring for new API library	Dominik Schürmann	2014-02-09	1	-0/+1
\|
*	Switch from ActionBarSherlock to ActionBarCompat	Dominik Schürmann	2014-02-02	1	-1/+0
\|
*	New build files for spongy castle	Dominik Schürmann	2014-01-27	1	-0/+4
\|
*	fix some small layout bugs, add barcode scanner lib as source lib, fix qr ↵	Dominik Schürmann	2014-01-14	1	-1/+2
\| \| \| \|	code scanning issues
*	fix gradle build	Dominik Schürmann	2014-01-10	1	-1/+1
\|
*	add AndroidBootstrap lib	Dominik Schürmann	2014-01-09	1	-0/+1
\|
*	externalize zxing lib, fix gradle build	Dominik Schürmann	2014-01-06	1	-0/+1
\|
*	New list with sticky list headers library	Dominik Schürmann	2014-01-02	1	-1/+2
\|
*	Simple new list implementations, remove library, use simple adapter with ↵	Dominik Schürmann	2014-01-01	1	-2/+1
\| \| \| \|	headings
*	fix gradle build	Dominik Schürmann	2013-12-30	1	-1/+2
\|
*	update gradle, description,...	Dominik Schürmann	2013-09-09	1	-0/+2
\|
*	fix gradle build	Felix Bechstein	2013-08-15	1	-1/+1
\|
*	move ActionBarSherlock lib, add gradle build files	Dominik Schürmann	2013-05-25	1	-0/+1