aboutsummaryrefslogtreecommitdiffstats
path: root/app/src/main/res
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master'Kenny Root2015-03-2337-257/+115
| | | | | | 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-211-16/+27
|
* Merge branch 'master' into gradle-conversionKenny Root2014-10-197-0/+0
| | | | Change-Id: I77af95fa7ddb22c99f13f0770daba02a98bcf5b7
* Fix keyType layout and space out buttons a bitKenny Root2014-10-181-4/+6
| | | | Change-Id: Idd46bb2ada1ff7ac934d5e20faee97842a990102
* Merge branch 'master' into gradle-conversionKenny Root2014-10-185-3/+13
|
* Revert "Add BuildConfig stuff instead of msg_version"Kenny Root2014-10-032-2/+2
| | | | This reverts commit d2eb6b37b3910f404f229625a39a11954fac681d.
* Add BuildConfig stuff instead of msg_versionKenny Root2014-10-022-2/+2
|
* Convert to gradle build systemKenny Root2014-10-01103-0/+9254