diff options
| author | Samuel Tardieu <sam@rfc1149.net> | 2013-05-16 20:43:58 +0200 |
|---|---|---|
| committer | Samuel Tardieu <sam@rfc1149.net> | 2013-05-16 20:45:07 +0200 |
| commit | 76a7404e536047dd74721ac9c89fd10a8a2dd16d (patch) | |
| tree | 42b50d618507f8f8ceccae40d2b316e62e97a479 /main/res/layout/navigate.xml | |
| parent | ec37680fdf788750f2ae09a905db1ae166cd80a8 (diff) | |
| parent | a5b58fd1a9f2e54c0d71729faffa881a7fdb586b (diff) | |
| download | cgeo-76a7404e536047dd74721ac9c89fd10a8a2dd16d.zip cgeo-76a7404e536047dd74721ac9c89fd10a8a2dd16d.tar.gz cgeo-76a7404e536047dd74721ac9c89fd10a8a2dd16d.tar.bz2 | |
Merge branch 'release' into upstream
Conflicts:
main/res/values/strings_not_translatable.xml
Diffstat (limited to 'main/res/layout/navigate.xml')
0 files changed, 0 insertions, 0 deletions