aboutsummaryrefslogtreecommitdiffstats
path: root/app/src/main/java/org
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into gradle-conversionKenny Root2015-03-273-58/+74
|
* Merge branch 'master' into gradle-conversionKenny Root2015-03-273-5/+21
|
* Merge branch 'master' into gradle-conversionKenny Root2015-03-272-125/+176
| | | | | Conflicts: app/src/main/java/org/connectbot/util/UberColorPickerDialog.java
* Add some whitespace rules and fixes for themKenny Root2015-03-2325-219/+234
|
* Clean up some import style violationsKenny Root2015-03-234-12/+7
|
* checkstyle: fix leading spacesKenny Root2015-03-231-1/+1
|
* Merge remote-tracking branch 'origin/master'Kenny Root2015-03-234-13/+84
| | | | | | Conflicts: app/src/main/java/org/connectbot/HostListActivity.java app/src/main/java/org/connectbot/service/TerminalKeyListener.java
* Disable EC generation when no supportKenny Root2014-10-181-0/+7
| | | | Change-Id: I1d03afa0a37cfa2779e1264aaf16052c6539640f
* Add class hiding for KeyEvent debuggingKenny Root2014-10-181-3/+54
| | | | Change-Id: Id34acf00f9ec538d81b72b970ae1990c6ed36510
* Merge branch 'master' into gradle-conversionKenny Root2014-10-182-5/+19
|
* Revert "Add BuildConfig stuff instead of msg_version"Kenny Root2014-10-032-12/+3
| | | | This reverts commit d2eb6b37b3910f404f229625a39a11954fac681d.
* Fix API usage for StrictModeSetupKenny Root2014-10-022-9/+11
|
* Add BuildConfig stuff instead of msg_versionKenny Root2014-10-022-3/+12
|
* Fix tabs violationsKenny Root2014-10-018-26/+26
|
* Add some TargetApi annotations to appease lintKenny Root2014-10-015-4/+18
|
* Convert to gradle build systemKenny Root2014-10-0155-0/+15640