diff options
| author | Bananeweizen <bananeweizen@gmx.de> | 2013-07-19 17:00:20 +0200 |
|---|---|---|
| committer | Bananeweizen <bananeweizen@gmx.de> | 2013-07-19 17:00:20 +0200 |
| commit | 07f3b3337f2f3bac0a4c1f16b82e2d283cc9f0d2 (patch) | |
| tree | cadebfd0d4dd1289fd53464bf778dcfa4e8ed5bf /main/support | |
| parent | 70b56e101917d5c141bd2f48c784da8f9829fb11 (diff) | |
| download | cgeo-07f3b3337f2f3bac0a4c1f16b82e2d283cc9f0d2.zip cgeo-07f3b3337f2f3bac0a4c1f16b82e2d283cc9f0d2.tar.gz cgeo-07f3b3337f2f3bac0a4c1f16b82e2d283cc9f0d2.tar.bz2 | |
fix conflict from manual merge in strings.xml
Diffstat (limited to 'main/support')
0 files changed, 0 insertions, 0 deletions