aboutsummaryrefslogtreecommitdiffstats
path: root/app/src/main/res/layout/act_colors.xml
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into gradle-conversionKenny Root2015-03-271-1/+0
|
* Merge branch 'master' into gradle-conversionKenny Root2015-03-271-29/+29
| | | | | Conflicts: app/src/main/java/org/connectbot/util/UberColorPickerDialog.java
* Convert to gradle build systemKenny Root2014-10-011-0/+71