diff options
| author | Samuel Tardieu <sam@rfc1149.net> | 2013-05-20 23:13:00 +0200 |
|---|---|---|
| committer | Samuel Tardieu <sam@rfc1149.net> | 2013-05-20 23:13:00 +0200 |
| commit | f16becfdc6b90f6fdbdfd57b4525240749b5dcfe (patch) | |
| tree | 4e2d17909385fbd2290528e8c191d58a483ee105 /main/res | |
| parent | a313dbf8c386311e77b265cbed14491e40983c3f (diff) | |
| parent | 9ba8167a4cd257bf65ea928bbd0f005bb088cab9 (diff) | |
| download | cgeo-f16becfdc6b90f6fdbdfd57b4525240749b5dcfe.zip cgeo-f16becfdc6b90f6fdbdfd57b4525240749b5dcfe.tar.gz cgeo-f16becfdc6b90f6fdbdfd57b4525240749b5dcfe.tar.bz2 | |
Merge branch 'release' into upstream
Conflicts:
main/res/values/strings_not_translatable.xml
Diffstat (limited to 'main/res')
| -rw-r--r-- | main/res/values/strings_not_translatable.xml | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/main/res/values/strings_not_translatable.xml b/main/res/values/strings_not_translatable.xml index 8d70e14..89a54c0 100644 --- a/main/res/values/strings_not_translatable.xml +++ b/main/res/values/strings_not_translatable.xml @@ -96,8 +96,10 @@ <!-- changelog -->
<string name="changelog" translatable="false">\n
- <b>Next release</b>\n\n
- <b>Next bugfix release</b>\n
+ <b>Next release</b>\n
+ \n
+ \n
+ <b>2013.05.18</b>\n
<b>Bugfixing:</b>\n
ยท Correction for compatability issue with tablet devices\n
\n
|