Merge pull request #404 from jschmid/patch-1

thedaniel · thedaniel · commit c00b49a0694e · 2012-12-19T14:24:33.000-08:00
Android: Ignore the proguard folder
diff --git a/Android.gitignore b/Android.gitignore
@@ -18,3 +18,6 @@ local.properties
 # Eclipse project files
 .classpath
 .project
+
+# Proguard folder generated by Eclipse
+proguard/
