connectbot-yubikey/connectbot - connectbot with patches for nfc authentication

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge pull request #109 from jklein24/confirmdisconnect	Kenny Root	2015-07-29	1	-0/+4
\|\ \| \| \| \|	Add a confirm dialog for the disconnect all action.
\| *	Add a confirm dialog for the disconnect all action.	Jeremy Klein	2015-07-29	1	-0/+4
\| \|
* \|	Filter out lint false positive	Kenny Root	2015-07-29	1	-2/+3
\| \|
* \|	Change three dots to elipsis	Kenny Root	2015-07-29	1	-1/+1
\|/
*	strings: add some context for translators	Kenny Root	2015-07-19	1	-1/+12
\|
*	Merge branch 'master' into gradle-conversion	Kenny Root	2015-07-15	1	-0/+4
\|
*	Merge branch 'master' into gradle-conversion	Kenny Root	2015-04-19	1	-0/+5
\|
*	Merge branch 'master' into gradle-conversion	Kenny Root	2015-04-14	1	-6/+0
\|
*	Merge branch 'master' into gradle-conversion	Kenny Root	2015-03-27	1	-0/+4
\|
*	Merge branch 'master' into gradle-conversion	Kenny Root	2015-03-27	1	-4/+6
\| \| \| \| \|	Conflicts: app/src/main/java/org/connectbot/util/UberColorPickerDialog.java
*	Merge branch 'master' into gradle-conversion	Kenny Root	2015-03-26	1	-0/+3
\|
*	Merge branch 'master' into gradle-conversion	Kenny Root	2015-03-26	1	-0/+1
\|
*	Merge remote-tracking branch 'origin/master'	Kenny Root	2015-03-23	2	-20/+18
\| \| \| \| \| \|	Conflicts: app/src/main/java/org/connectbot/HostListActivity.java app/src/main/java/org/connectbot/service/TerminalKeyListener.java
*	Merge branch 'master' into gradle-conversion	Kenny Root	2014-10-18	1	-0/+5
\|
*	Convert to gradle build system	Kenny Root	2014-10-01	5	-0/+696