aboutsummaryrefslogtreecommitdiffstats
path: root/main/src/cgeo/geocaching/ui
diff options
context:
space:
mode:
authorSamuel Tardieu <sam@rfc1149.net>2012-06-17 13:18:43 +0200
committerSamuel Tardieu <sam@rfc1149.net>2012-06-17 13:18:43 +0200
commitd802aa775188458c6639338821d8f13f5191c9bf (patch)
tree310ac6d5191a321fca3e5aa9beec3a7a964ec50b /main/src/cgeo/geocaching/ui
parent4cfa9802ed20d1ba979ca95c75b39e5d2facd890 (diff)
parent903ac4252151004f27e975384f71defbfb11f1e1 (diff)
downloadcgeo-d802aa775188458c6639338821d8f13f5191c9bf.zip
cgeo-d802aa775188458c6639338821d8f13f5191c9bf.tar.gz
cgeo-d802aa775188458c6639338821d8f13f5191c9bf.tar.bz2
Merge branch 'release' into upstream
Conflicts: main/res/values/strings.xml
Diffstat (limited to 'main/src/cgeo/geocaching/ui')
0 files changed, 0 insertions, 0 deletions