aboutsummaryrefslogtreecommitdiffstats
path: root/app/src/main/java/org/connectbot/ConsoleActivity.java
diff options
context:
space:
mode:
authorJeremy Klein <jlklein@google.com>2015-10-09 11:28:04 -0700
committerJeremy Klein <jlklein@google.com>2015-10-09 11:29:27 -0700
commitfc35568a1ad2b9eb852bc7577908f5aba161f413 (patch)
tree52ce817c838cfbf23dadbd5a46cdf0d469a25997 /app/src/main/java/org/connectbot/ConsoleActivity.java
parentbe032f4719736adb19c1ec174d869923555e6d48 (diff)
downloadconnectbot-fc35568a1ad2b9eb852bc7577908f5aba161f413.tar.gz
connectbot-fc35568a1ad2b9eb852bc7577908f5aba161f413.tar.bz2
connectbot-fc35568a1ad2b9eb852bc7577908f5aba161f413.zip
Rebase and fix conflicts with textview change
Diffstat (limited to 'app/src/main/java/org/connectbot/ConsoleActivity.java')
0 files changed, 0 insertions, 0 deletions