aboutsummaryrefslogtreecommitdiffstats
path: root/cgeo-contacts
diff options
context:
space:
mode:
authorMichael Keppler <michael.keppler@gmx.de>2014-04-28 09:04:29 +0200
committerMichael Keppler <michael.keppler@gmx.de>2014-04-28 09:04:29 +0200
commite9fdf1928397d2f31bc5f94030fe4f546c195cfe (patch)
tree2fdabf0e42f622bb6082627f31bda7a0fb3470c3 /cgeo-contacts
parent35358ed4fe5ecd28033f6b5a6f1f723eaf2acf5a (diff)
parentc1e5ee007e857460cd5b430a92bfa1b919de4931 (diff)
downloadcgeo-e9fdf1928397d2f31bc5f94030fe4f546c195cfe.zip
cgeo-e9fdf1928397d2f31bc5f94030fe4f546c195cfe.tar.gz
cgeo-e9fdf1928397d2f31bc5f94030fe4f546c195cfe.tar.bz2
Merge remote-tracking branch 'origin/release'
Conflicts: main/src/cgeo/geocaching/DataStore.java
Diffstat (limited to 'cgeo-contacts')
0 files changed, 0 insertions, 0 deletions