aboutsummaryrefslogtreecommitdiffstats
path: root/app/src/main/AndroidManifest.xml
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into gradle-conversionKenny Root2015-04-021-2/+2
|
* Merge remote-tracking branch 'origin/master'Kenny Root2015-03-231-2/+2
| | | | | | Conflicts: app/src/main/java/org/connectbot/HostListActivity.java app/src/main/java/org/connectbot/service/TerminalKeyListener.java
* Merge branch 'master' into gradle-conversionKenny Root2014-10-181-2/+2
|
* Convert to gradle build systemKenny Root2014-10-011-0/+96