| commit | 5ae59c6599c50a0bdd6f22be401f713791b3941a | [log] [download] |
|---|---|---|
| author | WHR <msl0000023508@gmail.com> | Sun Mar 01 23:54:14 2020 +0800 |
| committer | WHR <msl0000023508@gmail.com> | Sun Mar 01 23:54:14 2020 +0800 |
| tree | ca60e390c2fb4cb05c98aedd4a7a6d255f36eeef | |
| parent | 26fda491c864ca4c8e463a04c57768f1595cd750 [diff] | |
| parent | bbd3a85ac6055d2197fd37d69e2ba18b500e3435 [diff] |
Merge branch 'ssh-based-android-client' of ssh://git.code.sf.net/p/sshout/android-client-code into ssh-based-android-client Conflicts: app/src/main/java/org/rivoreo/sshout/ClientService.java app/src/main/java/org/rivoreo/sshout/MessageListener.java