| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | 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 |
 |
index : connectbot-yubikey/connectbot | |
| connectbot with patches for nfc authentication | James |
| aboutsummaryrefslogtreecommitdiffstats |