Merge branch 'matto1990-patch-1' into dev

JakeWharton · JakeWharton · commit 6738af8569c5 · 2012-08-17T14:42:14.000-07:00
diff --git a/.gitignore b/.gitignore
@@ -16,3 +16,8 @@ classes
 target
 release.properties
 pom.xml.*
+
+#Command line
+local.properties
+build.xml
+proguard-project.txt
