Merge pull request github#301 from jshou/patch-1

* patch-1: add intellij files to Android.gitignore
drothmaler · Dec 19, 2012 · 1b3555f · 1b3555f
2 parents 7e78204 + e1d8dcf
commit 1b3555f
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/Android.gitignore b/Android.gitignore
@@ -20,4 +20,11 @@ local.properties
 .project
 
 # Proguard folder generated by Eclipse
-proguard/
+proguard/
+
+# Intellij project files
+*.iml
+*.ipr
+*.iws
+.idea/
+