aboutsummaryrefslogtreecommitdiff
path: root/.gitattributes
Commit message (Expand)AuthorAge
* Merge branch 'dev-search' into dev•••Conflicts: gen/net/cbaines/suma/R.java res/values/strings.xml src/net/cbaines/suma/DataManager.java src/net/cbaines/suma/MapActivity.java src/net/cbaines/suma/POI.java Christopher Baines2012-03-09