diff options
| author | Samuel Tardieu <sam@rfc1149.net> | 2014-08-28 12:37:09 +0200 |
|---|---|---|
| committer | Samuel Tardieu <sam@rfc1149.net> | 2014-08-28 12:37:09 +0200 |
| commit | 3fe7f69b0c99cb64b0dcbd72f4d46c4ce5961d9f (patch) | |
| tree | 3934d502ade4b8bd6b2a61f27ab1a3665d6d6322 /main/src/cgeo/geocaching/connector/oc/OkapiClient.java | |
| parent | 2e17db77a3358e8b11da126a846d337fa6b1db90 (diff) | |
| parent | d48db1e4b122347cfa6a30e5d97b93afab5f7fb4 (diff) | |
| download | cgeo-3fe7f69b0c99cb64b0dcbd72f4d46c4ce5961d9f.zip cgeo-3fe7f69b0c99cb64b0dcbd72f4d46c4ce5961d9f.tar.gz cgeo-3fe7f69b0c99cb64b0dcbd72f4d46c4ce5961d9f.tar.bz2 | |
Merge branch 'issue-2803' into upstream
Conflicts:
main/res/xml/preferences.xml
Diffstat (limited to 'main/src/cgeo/geocaching/connector/oc/OkapiClient.java')
0 files changed, 0 insertions, 0 deletions