aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormucek4 <tomaz@gorenc.org>2013-09-24 08:22:52 +0200
committermucek4 <tomaz@gorenc.org>2013-09-24 08:22:52 +0200
commit30033efa4938dd5cba2a2db91b611adeade0b182 (patch)
tree704c6a9d813e13ee3ee9e116efa8f9110229237b
parent00436c5812fb9eec1a699740829830cbb65c9a6e (diff)
parent9e93474a419ed9e45481195df51ab50c306dcdec (diff)
downloadcgeo-30033efa4938dd5cba2a2db91b611adeade0b182.zip
cgeo-30033efa4938dd5cba2a2db91b611adeade0b182.tar.gz
cgeo-30033efa4938dd5cba2a2db91b611adeade0b182.tar.bz2
Merge branch 'release'
-rw-r--r--cgeo-calendar/AndroidManifest.xml4
-rw-r--r--main/res/values/changelog_release.xml2
2 files changed, 3 insertions, 3 deletions
diff --git a/cgeo-calendar/AndroidManifest.xml b/cgeo-calendar/AndroidManifest.xml
index 6d0ccbd..561b918 100644
--- a/cgeo-calendar/AndroidManifest.xml
+++ b/cgeo-calendar/AndroidManifest.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="cgeo.calendar"
- android:versionCode="2"
- android:versionName="1.1" >
+ android:versionCode="3"
+ android:versionName="1.2" >
<uses-sdk
android:minSdkVersion="4"
diff --git a/main/res/values/changelog_release.xml b/main/res/values/changelog_release.xml
index b8a5e41..fcb417b 100644
--- a/main/res/values/changelog_release.xml
+++ b/main/res/values/changelog_release.xml
@@ -2,7 +2,7 @@
<resources>
<!-- changelog for the release branch -->
<string name="changelog_release" translatable="false">\n
- <b>Next bugfix release</b>\n
+ <b>2013.09.19</b>\n
· Unscaled log picture now uploaded correctly\n
· GPS exhibit not recognized as event cache\n
· Lost and Found cache type not parsed\n