diff options
| author | Samuel Tardieu <sam@rfc1149.net> | 2014-09-09 20:12:53 +0200 |
|---|---|---|
| committer | Samuel Tardieu <sam@rfc1149.net> | 2014-09-09 20:12:53 +0200 |
| commit | 184b08a49f5b2db6c77ba0a96991b3384ccf9d86 (patch) | |
| tree | 5d81a5456ec64ca62c1ff3d872332d2c3b350dd9 | |
| parent | 8acc1aab8c7cfcb81e7275b3cc995d3d51bf2401 (diff) | |
| parent | 89b5653b322534449d64006c4861bc85be086cd5 (diff) | |
| download | cgeo-184b08a49f5b2db6c77ba0a96991b3384ccf9d86.zip cgeo-184b08a49f5b2db6c77ba0a96991b3384ccf9d86.tar.gz cgeo-184b08a49f5b2db6c77ba0a96991b3384ccf9d86.tar.bz2 | |
Merge branch 'release' into upstream
| -rw-r--r-- | android-support-v7-appcompat/android-support-v7-appcompat.iml | 2 | ||||
| -rw-r--r-- | main/res/values/changelog_release.xml | 1 | ||||
| -rw-r--r-- | mapswithme-api/mapswithme-api.iml | 2 | ||||
| -rw-r--r-- | showcaseview/project.properties | 2 | ||||
| -rw-r--r-- | showcaseview/showcaseview.iml | 2 |
5 files changed, 5 insertions, 4 deletions
diff --git a/android-support-v7-appcompat/android-support-v7-appcompat.iml b/android-support-v7-appcompat/android-support-v7-appcompat.iml index ca339e4..35b1b99 100644 --- a/android-support-v7-appcompat/android-support-v7-appcompat.iml +++ b/android-support-v7-appcompat/android-support-v7-appcompat.iml @@ -25,7 +25,7 @@ <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" generated="true" /> </content> - <orderEntry type="jdk" jdkName="Android API 19 Platform" jdkType="Android SDK" /> + <orderEntry type="inheritedJdk" /> <orderEntry type="module-library" exported=""> <library name="android-support-v4.jar"> <CLASSES> diff --git a/main/res/values/changelog_release.xml b/main/res/values/changelog_release.xml index 8fb9514..96056e1 100644 --- a/main/res/values/changelog_release.xml +++ b/main/res/values/changelog_release.xml @@ -5,6 +5,7 @@ <b>Next bugfix release:</b>\n · Fix: Hardware acceleration is unreliable on some devices\n · Fix: Return correct error message if a cache is unpublished\n + · Fix: Better icon for navigation menu in cache details\n \n <b>2014.09.02:</b>\n · Fix: Hardware acceleration is unreliable on Android < 4.2 and on some devices\n diff --git a/mapswithme-api/mapswithme-api.iml b/mapswithme-api/mapswithme-api.iml index 4d01e37..1e6e952 100644 --- a/mapswithme-api/mapswithme-api.iml +++ b/mapswithme-api/mapswithme-api.iml @@ -22,7 +22,7 @@ <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" generated="true" /> </content> - <orderEntry type="jdk" jdkName="Android API 19 Platform" jdkType="Android SDK" /> + <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> </component> </module> diff --git a/showcaseview/project.properties b/showcaseview/project.properties index 91d2b02..218eacc 100644 --- a/showcaseview/project.properties +++ b/showcaseview/project.properties @@ -11,5 +11,5 @@ #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt # Project target. -target=android-19 +target=Google Inc.:Google APIs (x86 System Image):19 android.library=true diff --git a/showcaseview/showcaseview.iml b/showcaseview/showcaseview.iml index bcf8f67..e47f7c6 100644 --- a/showcaseview/showcaseview.iml +++ b/showcaseview/showcaseview.iml @@ -14,7 +14,7 @@ <sourceFolder url="file://$MODULE_DIR$/java" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" generated="true" /> </content> - <orderEntry type="jdk" jdkName="Android API 19 Platform (1)" jdkType="Android SDK" /> + <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> </component> </module> |