diff options
| author | Samuel Tardieu <sam@rfc1149.net> | 2012-06-28 11:34:50 +0200 |
|---|---|---|
| committer | Samuel Tardieu <sam@rfc1149.net> | 2012-06-28 11:34:50 +0200 |
| commit | fd3eda74fea48e9f105c711fec027c412c71c19e (patch) | |
| tree | ccf6715ecbe809fcf7e6aa700c5481e37858e234 /main/src | |
| parent | 4314cef73c43d4906b6e064f7f2f0c31a05317e9 (diff) | |
| parent | 42165d66b4fea581cf313980b76cc6dd2a6af37e (diff) | |
| download | cgeo-fd3eda74fea48e9f105c711fec027c412c71c19e.zip cgeo-fd3eda74fea48e9f105c711fec027c412c71c19e.tar.gz cgeo-fd3eda74fea48e9f105c711fec027c412c71c19e.tar.bz2 | |
Merge remote-tracking branch 'upstream/release' into upstream
Conflicts:
main/res/values/strings.xml
main/src/cgeo/geocaching/connector/gc/GCConstants.java
Diffstat (limited to 'main/src')
0 files changed, 0 insertions, 0 deletions