diff options
| author | Samuel Tardieu <sam@rfc1149.net> | 2013-06-22 18:37:08 +0200 |
|---|---|---|
| committer | Samuel Tardieu <sam@rfc1149.net> | 2013-06-22 18:37:08 +0200 |
| commit | ec9af65d1d5130b0c046c58b964dfd04944eb218 (patch) | |
| tree | 78da645e466adb2b51ec32ac5f1a2a1f9757eb91 /main/src/cgeo/geocaching/ui/logs/LogsViewCreator.java | |
| parent | e30e955b3a9800ea783f36f64c42bfc19c795658 (diff) | |
| parent | 213818180224cfea540e078708215f27be09d7d6 (diff) | |
| download | cgeo-ec9af65d1d5130b0c046c58b964dfd04944eb218.zip cgeo-ec9af65d1d5130b0c046c58b964dfd04944eb218.tar.gz cgeo-ec9af65d1d5130b0c046c58b964dfd04944eb218.tar.bz2 | |
Merge branch 'release' into upstream
Conflicts:
main/res/values-fr/strings.xml
main/res/values/strings.xml
send2cgeo/send2cgeo.user.js
Diffstat (limited to 'main/src/cgeo/geocaching/ui/logs/LogsViewCreator.java')
0 files changed, 0 insertions, 0 deletions