diff options
author | Samuel Tardieu <sam@rfc1149.net> | 2014-09-17 11:54:33 +0200 |
---|---|---|
committer | Samuel Tardieu <sam@rfc1149.net> | 2014-09-17 11:54:33 +0200 |
commit | 233ba1214ed55fd7bac30a7559c4de6d2472903a (patch) | |
tree | 20cd380511c79aa360e4df290eb24fe894b9f0af /README.md | |
parent | a5ffe4f7d11f529e3bf3196cdc655a8dec71c2af (diff) | |
parent | af3cc5fbaa2bb6abbd595ad0e6e3aba8980d6224 (diff) | |
download | cgeo-233ba1214ed55fd7bac30a7559c4de6d2472903a.zip cgeo-233ba1214ed55fd7bac30a7559c4de6d2472903a.tar.gz cgeo-233ba1214ed55fd7bac30a7559c4de6d2472903a.tar.bz2 |
Merge branch 'release' into upstream
Conflicts:
main/res/values-da/strings.xml
Diffstat (limited to 'README.md')
0 files changed, 0 insertions, 0 deletions