aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Hengeveld <danielwh@gmail.com>2012-12-19 14:58:58 -0800
committerDaniel Hengeveld <danielwh@gmail.com>2012-12-19 14:58:58 -0800
commitf31b319dca10213163411cb710c27dc37ed3eac5 (patch)
tree8dd5c07bdb94d96f164bd262d971cf4d9a0a939e
parent13a24fbe6bcb13375ee7bc43b089335867c06701 (diff)
parentaec35399986a290636040a0875771dbccbe08d26 (diff)
downloadgitignore-f31b319dca10213163411cb710c27dc37ed3eac5.tar.gz
gitignore-f31b319dca10213163411cb710c27dc37ed3eac5.zip
Merge pull request #301 from jshou/patch-1
* patch-1: add intellij files to Android.gitignore
-rw-r--r--Android.gitignore9
1 files changed, 8 insertions, 1 deletions
diff --git a/Android.gitignore b/Android.gitignore
index cd49c694..87a44e0e 100644
--- a/Android.gitignore
+++ b/Android.gitignore
@@ -20,4 +20,11 @@ local.properties
.project
# Proguard folder generated by Eclipse
-proguard/ \ No newline at end of file
+proguard/
+
+# Intellij project files
+*.iml
+*.ipr
+*.iws
+.idea/
+