From 280964b04c51401b51d4f59224c8b5ff8b527ba1 Mon Sep 17 00:00:00 2001
From: James Strassburg <jstrassburg@gmail.com>
Date: Wed, 12 Dec 2012 21:46:26 -0600
Subject: [PATCH] Added ignores for IntelliJ Idea project files, Mac specific
 .DS_Store, and Android ProGuard stuff

---
 Android.gitignore | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/Android.gitignore b/Android.gitignore
index fb8e9e09..17b12cb6 100644
--- a/Android.gitignore
+++ b/Android.gitignore
@@ -18,3 +18,17 @@ local.properties
 # Eclipse project files
 .classpath
 .project
+
+# IntelliJ Idea related
+out/
+.idea/
+*.iml
+*.ipr
+*.iws
+
+# Mac specific
+*.DS_Store
+
+# ProGuard
+proguard_project.txt
+proguard_logs/