From e0ebee8c70af2da95bf23424cf7f82ba055cd8af Mon Sep 17 00:00:00 2001
From: unknown <barsik107@gmail.com>
Date: Wed, 28 May 2014 00:20:51 +0300
Subject: [PATCH] Updated gitignore files.

---
 .gitignore                  |  1 +
 OsmAnd/.gitignore           |  2 +-
 OsmAnd/OsmAnd.iml           | 30 ++++--------------------------
 SherlockBar/.gitignore      |  2 +-
 SherlockBar/SherlockBar.iml |  5 +++--
 5 files changed, 10 insertions(+), 30 deletions(-)

diff --git a/.gitignore b/.gitignore
index d75872ad4a..e32c12c828 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@ mx_*.png
 .settings
 .idea
 out/
+*.iml
diff --git a/OsmAnd/.gitignore b/OsmAnd/.gitignore
index cec5fa4690..891d0913c5 100644
--- a/OsmAnd/.gitignore
+++ b/OsmAnd/.gitignore
@@ -9,4 +9,4 @@ obj/
 cpd.xml
 jni/Local.mk
 out/
-use/
+use/
\ No newline at end of file
diff --git a/OsmAnd/OsmAnd.iml b/OsmAnd/OsmAnd.iml
index 2844914043..b21cc219b2 100644
--- a/OsmAnd/OsmAnd.iml
+++ b/OsmAnd/OsmAnd.iml
@@ -21,35 +21,13 @@
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" generated="true" />
     </content>
-    <orderEntry type="jdk" jdkName="Android 4.1.2 Platform" jdkType="Android SDK" />
+    <orderEntry type="jdk" jdkName="Android API 19 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="SherlockBar" />
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$OSMAND_TRUNK$/OsmAnd-java/OsmAnd-core-android.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES>
-          <root url="jar://$OSMAND_TRUNK$/OsmAnd-java/OsmAnd-core-android.jar!/" />
-        </SOURCES>
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="file://$MODULE_DIR$/libs" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES>
-          <root url="file://$MODULE_DIR$/libs" />
-        </SOURCES>
-        <jarDirectory url="file://$MODULE_DIR$/libs" recursive="false" />
-        <jarDirectory url="file://$MODULE_DIR$/libs" recursive="false" type="SOURCES" />
-      </library>
-    </orderEntry>
+    <orderEntry type="module" module-name="OsmAnd-java" />
+    <orderEntry type="library" scope="PROVIDED" name="libs" level="project" />
   </component>
 </module>
 
diff --git a/SherlockBar/.gitignore b/SherlockBar/.gitignore
index e614fbbef9..703f4e43d5 100644
--- a/SherlockBar/.gitignore
+++ b/SherlockBar/.gitignore
@@ -1,2 +1,2 @@
 bin
-gen
+gen
\ No newline at end of file
diff --git a/SherlockBar/SherlockBar.iml b/SherlockBar/SherlockBar.iml
index 701906d795..f15ee5d786 100644
--- a/SherlockBar/SherlockBar.iml
+++ b/SherlockBar/SherlockBar.iml
@@ -21,10 +21,11 @@
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" generated="true" />
     </content>
-    <orderEntry type="jdk" jdkName="Android 4.1.2 Platform" jdkType="Android SDK" />
+    <orderEntry type="jdk" jdkName="Android API 19 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="libs" level="project" />
   </component>
 </module>