diff options
| author | Samuel Tardieu <sam@rfc1149.net> | 2014-09-06 11:12:54 +0200 |
|---|---|---|
| committer | Samuel Tardieu <sam@rfc1149.net> | 2014-09-06 11:12:54 +0200 |
| commit | ff57a501dea2977878c96ea547a7d536fea91d98 (patch) | |
| tree | b4f6ffea76c8347542865f46873b9a860f7fdf92 /main/libs | |
| parent | 759b9d9a640f9b3733f450ff60febc261d3d1292 (diff) | |
| parent | 2fedb8bc7c4933121680874c756736be54b8c894 (diff) | |
| download | cgeo-ff57a501dea2977878c96ea547a7d536fea91d98.zip cgeo-ff57a501dea2977878c96ea547a7d536fea91d98.tar.gz cgeo-ff57a501dea2977878c96ea547a7d536fea91d98.tar.bz2 | |
Merge branch 'release' into upstream
Conflicts:
main/AndroidManifest.xml
Diffstat (limited to 'main/libs')
0 files changed, 0 insertions, 0 deletions