diff options
| author | Samuel Tardieu <sam@rfc1149.net> | 2013-04-06 14:47:53 +0200 |
|---|---|---|
| committer | Samuel Tardieu <sam@rfc1149.net> | 2013-04-06 14:47:53 +0200 |
| commit | 6d6ada1924129ee0b97a6dab7427f134faca0178 (patch) | |
| tree | fec5189fb750613d506d2e6d357393bef4604525 /tests/src/cgeo/geocaching/connector/gc/GCParserTest.java | |
| parent | 10110e6b83850b449ae559d06220e1d1faab3745 (diff) | |
| parent | c890bfe512653280ca23dae53281137a5db9ad54 (diff) | |
| download | cgeo-6d6ada1924129ee0b97a6dab7427f134faca0178.zip cgeo-6d6ada1924129ee0b97a6dab7427f134faca0178.tar.gz cgeo-6d6ada1924129ee0b97a6dab7427f134faca0178.tar.bz2 | |
Merge branch 'release' into upstream
Conflicts:
main/res/values/strings_not_translatable.xml
Diffstat (limited to 'tests/src/cgeo/geocaching/connector/gc/GCParserTest.java')
0 files changed, 0 insertions, 0 deletions