aboutsummaryrefslogtreecommitdiffstats
path: root/main/src/cgeo/geocaching/files/FileParser.java
diff options
context:
space:
mode:
authorSamuel Tardieu <sam@rfc1149.net>2013-05-19 18:45:40 +0200
committerSamuel Tardieu <sam@rfc1149.net>2013-05-19 18:45:40 +0200
commit1eba3b589fb265c3832d76d4ce51952e8a67c62e (patch)
tree0c80315a4e9e6d6cc65d6582854f9913c38f9faf /main/src/cgeo/geocaching/files/FileParser.java
parentf6b2099d8f8b4edc3eccab4ac396d983b05f9862 (diff)
parenta09d414466028179ac4c7737dd0336a6d38bc00d (diff)
downloadcgeo-1eba3b589fb265c3832d76d4ce51952e8a67c62e.zip
cgeo-1eba3b589fb265c3832d76d4ce51952e8a67c62e.tar.gz
cgeo-1eba3b589fb265c3832d76d4ce51952e8a67c62e.tar.bz2
Merge branch 'fix-2733' into upstream
Conflicts: main/res/values/strings_not_translatable.xml
Diffstat (limited to 'main/src/cgeo/geocaching/files/FileParser.java')
0 files changed, 0 insertions, 0 deletions