diff options
| author | Bananeweizen <bananeweizen@gmx.de> | 2013-08-18 19:50:41 +0200 |
|---|---|---|
| committer | Bananeweizen <bananeweizen@gmx.de> | 2013-08-18 19:50:41 +0200 |
| commit | f9474aa841400850c6d676f33bd03672345d4c03 (patch) | |
| tree | 4315047cfad97aa6f6190f76743ffe8ca64f84a4 /tests/src/cgeo/geocaching/GeocacheTest.java | |
| parent | cd03c1b91da2b5c8cc7eb4f5617263c6aebcbd21 (diff) | |
| parent | eb15dddf8715bbc1926b8030ab4db7fbeec666cf (diff) | |
| download | cgeo-f9474aa841400850c6d676f33bd03672345d4c03.zip cgeo-f9474aa841400850c6d676f33bd03672345d4c03.tar.gz cgeo-f9474aa841400850c6d676f33bd03672345d4c03.tar.bz2 | |
Merge remote-tracking branch 'rsudev/ocpl'
Conflicts:
main/res/values/preference_keys.xml
main/src/cgeo/geocaching/settings/Settings.java
main/src/cgeo/geocaching/settings/SettingsActivity.java
Diffstat (limited to 'tests/src/cgeo/geocaching/GeocacheTest.java')
0 files changed, 0 insertions, 0 deletions