aboutsummaryrefslogtreecommitdiffstats
path: root/cgeo-calendar
diff options
context:
space:
mode:
authorSamuel Tardieu <sam@rfc1149.net>2014-09-20 13:16:35 +0200
committerSamuel Tardieu <sam@rfc1149.net>2014-09-20 13:16:35 +0200
commit18499aab0d6722b20011f07ad2cac08ff3e64db9 (patch)
tree2c46a2aa132ed53d865766edef57fbfb805127b1 /cgeo-calendar
parent27acb3add2a41133b6762faf0152f3d43a8a24b6 (diff)
parent13527f9c79bd6b6c226c32532f917159f0ac404d (diff)
downloadcgeo-18499aab0d6722b20011f07ad2cac08ff3e64db9.zip
cgeo-18499aab0d6722b20011f07ad2cac08ff3e64db9.tar.gz
cgeo-18499aab0d6722b20011f07ad2cac08ff3e64db9.tar.bz2
Merge branch 'release' into upstream
Diffstat (limited to 'cgeo-calendar')
-rw-r--r--cgeo-calendar/AndroidManifest.xml8
1 files changed, 4 insertions, 4 deletions
diff --git a/cgeo-calendar/AndroidManifest.xml b/cgeo-calendar/AndroidManifest.xml
index 561b918..64968e5 100644
--- a/cgeo-calendar/AndroidManifest.xml
+++ b/cgeo-calendar/AndroidManifest.xml
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="cgeo.calendar"
- android:versionCode="3"
- android:versionName="1.2" >
+ android:versionCode="4"
+ android:versionName="1.4" >
<uses-sdk
- android:minSdkVersion="4"
+ android:minSdkVersion="7"
android:targetSdkVersion="13" />
<uses-permission android:name="android.permission.READ_CALENDAR" />
@@ -37,4 +37,4 @@
</activity>
</application>
-</manifest> \ No newline at end of file
+</manifest>