diff options
| author | Samuel Tardieu <sam@rfc1149.net> | 2013-01-03 13:48:13 +0100 |
|---|---|---|
| committer | Samuel Tardieu <sam@rfc1149.net> | 2013-01-03 13:48:13 +0100 |
| commit | 8276358559e9447eb3533275ee6b263b19cc4b55 (patch) | |
| tree | 5b2b565917a52c548de9de3ef68b0200fc610491 /main/src | |
| parent | b12be9146ef9610e0e970ac0f6e96e03e14d86f4 (diff) | |
| parent | d42f8c720fac64f730e38b9d332e49a377552f02 (diff) | |
| download | cgeo-8276358559e9447eb3533275ee6b263b19cc4b55.zip cgeo-8276358559e9447eb3533275ee6b263b19cc4b55.tar.gz cgeo-8276358559e9447eb3533275ee6b263b19cc4b55.tar.bz2 | |
Merge branch 'release' into upstream
Conflicts:
main/res/values/strings.xml
Diffstat (limited to 'main/src')
0 files changed, 0 insertions, 0 deletions