Unify and deduplicate gitignores

2015-09-09 21:24:36 -07:00 · 2015-09-09 21:24:36 -07:00 · faecbd03a0
commit faecbd03a0
parent 2bb4ae6984
3 changed files with 3 additions and 45 deletions
--- a/.gitignore
+++ b/.gitignore
@ -45,3 +45,6 @@ out
 # Imported libs
 extern/*/libs/
 extern/*/*/libs/
+
+# Tests
+junit-report.xml
--- a/F-Droid-Privileged/.gitignore
+++ b/F-Droid-Privileged/.gitignore
@ -1,33 +0,0 @@
-#Android specific
-bin
-gen
-obj
-lint.xml
-local.properties
-release.properties
-ant.properties
-*.class
-*.apk
-
-#Gradle
-.gradle
-build
-gradle.properties
-
-#Maven
-target
-pom.xml.*
-
-#Eclipse
-.project
-.classpath
-.settings
-.metadata
-
-#IntelliJ IDEA
-.idea
-*.iml
-
-#Lint output
-lint-report.html
-lint-report_files/*
--- a/F-Droid/test/.gitignore
+++ b/F-Droid/test/.gitignore
@ -1,12 +0,0 @@
-/local.properties
-/bin/
-/gen/
-/build/
-/.gradle/
-/build.xml
-*~
-/.idea/
-/*.iml
-out
-/.settings/
-junit-report.xml