diff options
| author | Samuel Tardieu <sam@rfc1149.net> | 2013-09-15 15:59:00 +0200 |
|---|---|---|
| committer | Samuel Tardieu <sam@rfc1149.net> | 2013-09-15 15:59:00 +0200 |
| commit | 4e733d326c8e6a0f532beb37a70953fc36b322d4 (patch) | |
| tree | 26c0c8d204e05f70a6be2b52e2e423d211e1448d /main/res/xml/preferences.xml | |
| parent | cc28e603739e010b13e2e2afa2260eaf63978cb1 (diff) | |
| parent | 1653d3ede5e1ef2b2ef4badbfcf836343fd4e503 (diff) | |
| download | cgeo-4e733d326c8e6a0f532beb37a70953fc36b322d4.zip cgeo-4e733d326c8e6a0f532beb37a70953fc36b322d4.tar.gz cgeo-4e733d326c8e6a0f532beb37a70953fc36b322d4.tar.bz2 | |
Merge branch 'release' into upstream
Conflicts:
main/src/cgeo/geocaching/network/HtmlImage.java
Diffstat (limited to 'main/res/xml/preferences.xml')
0 files changed, 0 insertions, 0 deletions