diff options
| author | Samuel Tardieu <sam@rfc1149.net> | 2013-07-09 08:06:27 +0200 |
|---|---|---|
| committer | Samuel Tardieu <sam@rfc1149.net> | 2013-07-09 08:06:27 +0200 |
| commit | ba4e3ee9b79ae3f9342508ff85ffa037f372e68f (patch) | |
| tree | bb106083a276f61062dd880e8f19181814a32ad5 /cgeo-calendar | |
| parent | a35680df33e1ecb00380edf768dffd508e8fba68 (diff) | |
| parent | 4eaf37c757e26a7f4be52cea6d59e3c9871dbf5c (diff) | |
| download | cgeo-ba4e3ee9b79ae3f9342508ff85ffa037f372e68f.zip cgeo-ba4e3ee9b79ae3f9342508ff85ffa037f372e68f.tar.gz cgeo-ba4e3ee9b79ae3f9342508ff85ffa037f372e68f.tar.bz2 | |
Merge branch 'release' into upstream
Conflicts:
main/res/values-de/strings.xml
Diffstat (limited to 'cgeo-calendar')
0 files changed, 0 insertions, 0 deletions