Merge pull request #301 from jshou/patch-1

* patch-1: add intellij files to Android.gitignore
2012-12-19 14:58:58 -08:00 · 2012-12-19 14:58:58 -08:00 · f31b319dca
commit f31b319dca
parent 13a24fbe6b aec3539998
1 changed files with 8 additions and 1 deletions
--- 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/
+