Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge branch 'dev-search' into dev | Christopher Baines | 2012-03-09 |
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 |