From e55b94a1d29c7a72b69ca2f64d2534e6bffdd7d4 Mon Sep 17 00:00:00 2001
From: Lars <gc@droescher.eu>
Date: Tue, 9 Sep 2014 17:08:55 +0200
Subject: Update changelog_release.xml

---
 main/res/values/changelog_release.xml | 1 +
 1 file changed, 1 insertion(+)

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 &lt; 4.2 and on some devices\n
-- 
cgit v1.1


From 2dd74ac7b758ca0ba1716ea93c6e0386353a44d7 Mon Sep 17 00:00:00 2001
From: Samuel Tardieu <sam@rfc1149.net>
Date: Tue, 9 Sep 2014 20:11:51 +0200
Subject: Inherit JDK in Intellij IDEA files

---
 android-support-v7-appcompat/android-support-v7-appcompat.iml | 2 +-
 mapswithme-api/mapswithme-api.iml                             | 2 +-
 showcaseview/showcaseview.iml                                 | 2 +-
 3 files changed, 3 insertions(+), 3 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/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/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>
-- 
cgit v1.1


From 89b5653b322534449d64006c4861bc85be086cd5 Mon Sep 17 00:00:00 2001
From: Samuel Tardieu <sam@rfc1149.net>
Date: Tue, 9 Sep 2014 20:12:38 +0200
Subject: Use the same properties in showcaseview

---
 showcaseview/project.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
-- 
cgit v1.1