diff options
| author | Samuel Tardieu <sam@rfc1149.net> | 2012-12-17 15:58:09 +0100 |
|---|---|---|
| committer | Samuel Tardieu <sam@rfc1149.net> | 2012-12-17 15:58:09 +0100 |
| commit | 5e3b688891cf3f34237604d861933bd91e5da650 (patch) | |
| tree | 4e047092a6da17a09c66739d8c6650e3f39c5907 /cgeo-calendar | |
| parent | 6191b4e2aa3b1dea8dd8a41f5396d5e069662f3f (diff) | |
| parent | fb507c2138f1f68e8b48779058967b077ac1e1f9 (diff) | |
| download | cgeo-5e3b688891cf3f34237604d861933bd91e5da650.zip cgeo-5e3b688891cf3f34237604d861933bd91e5da650.tar.gz cgeo-5e3b688891cf3f34237604d861933bd91e5da650.tar.bz2 | |
Merge branch 'release' into upstream
Conflicts:
main/res/values/strings.xml
Diffstat (limited to 'cgeo-calendar')
0 files changed, 0 insertions, 0 deletions