diff options
| author | Samuel Tardieu <sam@rfc1149.net> | 2014-08-24 23:36:20 +0200 |
|---|---|---|
| committer | Samuel Tardieu <sam@rfc1149.net> | 2014-08-24 23:36:20 +0200 |
| commit | 496de335bedd5facf1ff495a497b7136cfc766cd (patch) | |
| tree | cf875b28f6b29d656c0b8f0f6c9ed7973788d63c /mapswithme-api | |
| parent | 6784e38b8847898f140e50b34dc0d1b009d669b1 (diff) | |
| parent | 8f9366157835ce5da9e83034a5bfe6bc4ae14cfa (diff) | |
| download | cgeo-496de335bedd5facf1ff495a497b7136cfc766cd.zip cgeo-496de335bedd5facf1ff495a497b7136cfc766cd.tar.gz cgeo-496de335bedd5facf1ff495a497b7136cfc766cd.tar.bz2 | |
Merge branch 'release' into upstream
Conflicts:
main/res/values-fr/strings.xml
Diffstat (limited to 'mapswithme-api')
0 files changed, 0 insertions, 0 deletions