diff options
| author | Samuel Tardieu <sam@rfc1149.net> | 2013-01-08 14:26:45 +0100 |
|---|---|---|
| committer | Samuel Tardieu <sam@rfc1149.net> | 2013-01-08 14:26:45 +0100 |
| commit | ac9c2acc85904d99e201138e3ba1b338f8d68f57 (patch) | |
| tree | 26a7987251b42a28b697a1b6c3102b59ff87e171 /main/src/cgeo/geocaching/compatibility/AndroidLevel13Interface.java | |
| parent | fd2a02a84b2a7e62ec45f31f6979f50c5bed5116 (diff) | |
| parent | a358917d95b169a0c03c445a3ca816a0d2fb26a6 (diff) | |
| download | cgeo-ac9c2acc85904d99e201138e3ba1b338f8d68f57.zip cgeo-ac9c2acc85904d99e201138e3ba1b338f8d68f57.tar.gz cgeo-ac9c2acc85904d99e201138e3ba1b338f8d68f57.tar.bz2 | |
Merge branch 'release' into upstream
Conflicts:
main/res/values/strings.xml
main/src/cgeo/geocaching/files/SimpleDirChooser.java
Diffstat (limited to 'main/src/cgeo/geocaching/compatibility/AndroidLevel13Interface.java')
0 files changed, 0 insertions, 0 deletions