diff options
| author | Samuel Tardieu <sam@rfc1149.net> | 2011-11-01 14:55:27 +0100 |
|---|---|---|
| committer | Samuel Tardieu <sam@rfc1149.net> | 2011-11-01 14:55:27 +0100 |
| commit | cab454571a8cb532daae3b211d089faf1ea590d8 (patch) | |
| tree | d3c321f21e3aebf9270ae712cbcd2ce776e7c9df /main/src/cgeo/geocaching/connector/opencaching/OkapiClient.java | |
| parent | 3c82f15f68a60cd47c122c660c58219b265f7437 (diff) | |
| parent | df4c8020c942189ea7854e11baef81a48a88d6ef (diff) | |
| download | cgeo-cab454571a8cb532daae3b211d089faf1ea590d8.zip cgeo-cab454571a8cb532daae3b211d089faf1ea590d8.tar.gz cgeo-cab454571a8cb532daae3b211d089faf1ea590d8.tar.bz2 | |
Merge branch 'release' into upstream
Conflicts:
main/AndroidManifest.xml
main/res/values/strings.xml
main/src/cgeo/geocaching/cgBase.java
main/src/cgeo/geocaching/maps/CGeoMap.java
Diffstat (limited to 'main/src/cgeo/geocaching/connector/opencaching/OkapiClient.java')
0 files changed, 0 insertions, 0 deletions