diff options
| author | Bananeweizen <bananeweizen@gmx.de> | 2014-05-18 07:57:12 +0200 |
|---|---|---|
| committer | Bananeweizen <bananeweizen@gmx.de> | 2014-05-18 07:57:12 +0200 |
| commit | 5fcce648e200669f1ae0875c7aea9dc3a4a37574 (patch) | |
| tree | f3741fdf0c8fcb6e6728fa49d61af7ea6c7f1aaa /main/src/cgeo/geocaching/maps/interfaces/MapViewImpl.java | |
| parent | 6b2972bfd1fdc14cd84f78e3674e97b46675345d (diff) | |
| parent | 786eccacbb285696d504d08ba02c61400ce063a2 (diff) | |
| download | cgeo-5fcce648e200669f1ae0875c7aea9dc3a4a37574.zip cgeo-5fcce648e200669f1ae0875c7aea9dc3a4a37574.tar.gz cgeo-5fcce648e200669f1ae0875c7aea9dc3a4a37574.tar.bz2 | |
Merge remote-tracking branch 'schwabe/actionbar_pullrequest'
Conflicts:
main/res/values/preference_keys.xml
main/src/cgeo/geocaching/CgeoApplication.java
Diffstat (limited to 'main/src/cgeo/geocaching/maps/interfaces/MapViewImpl.java')
0 files changed, 0 insertions, 0 deletions