diff options
| author | Bananeweizen <bananeweizen@gmx.de> | 2011-11-13 08:02:12 +0100 |
|---|---|---|
| committer | Bananeweizen <bananeweizen@gmx.de> | 2011-11-13 08:02:12 +0100 |
| commit | dc30da9a8b2d430152e125512e37fefe4d25008c (patch) | |
| tree | 1a46e1b35881a1833e51108017ce220a772f076a /main/src/cgeo/geocaching/connector/opencaching/OkapiClient.java | |
| parent | 01a6ad62356e5bb3d67b60508abed7771fbc2603 (diff) | |
| parent | 759f158b115fe27f7c61409d5f540d1effb6c0e1 (diff) | |
| download | cgeo-dc30da9a8b2d430152e125512e37fefe4d25008c.zip cgeo-dc30da9a8b2d430152e125512e37fefe4d25008c.tar.gz cgeo-dc30da9a8b2d430152e125512e37fefe4d25008c.tar.bz2 | |
Merge remote branch 'stephanme/importwpt'
Conflicts:
tests/src/cgeo/geocaching/files/GPXImporterTest.java
tests/src/cgeo/geocaching/files/GPXParserTest.java
tests/src/cgeo/geocaching/files/LocParserTest.java
Diffstat (limited to 'main/src/cgeo/geocaching/connector/opencaching/OkapiClient.java')
0 files changed, 0 insertions, 0 deletions