aboutsummaryrefslogtreecommitdiffstats
path: root/README.md
diff options
context:
space:
mode:
authorSamuel Tardieu <sam@rfc1149.net>2014-09-17 11:54:33 +0200
committerSamuel Tardieu <sam@rfc1149.net>2014-09-17 11:54:33 +0200
commit233ba1214ed55fd7bac30a7559c4de6d2472903a (patch)
tree20cd380511c79aa360e4df290eb24fe894b9f0af /README.md
parenta5ffe4f7d11f529e3bf3196cdc655a8dec71c2af (diff)
parentaf3cc5fbaa2bb6abbd595ad0e6e3aba8980d6224 (diff)
downloadcgeo-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