From: Uwe Hermann <redacted>
Date: Wed, 27 Aug 2014 17:44:00 +0000 (+0200)
Subject: Only use one central .gitignore file.
X-Git-Tag: pulseview-0.3.0~557
X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=commitdiff_plain;h=0b8e35218a328079bd8b88ab5b4bc18ead473d06;hp=c82c7e4e330ce5aa04c4f3b8e6f8de85e3e288e1

Only use one central .gitignore file.
---

diff --git a/.gitignore b/.gitignore
index dc8ab9c6..d9ea23e3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,3 +27,20 @@ ui_*.h
 *.cpp_parameters
 
 config.h
+
+android/libs/
+android/assets/
+android/res/drawable/
+android/res/values/bundled_libs.xml
+android/res/*/strings.xml
+android/res/xml/device_filter.xml
+android/build.xml
+android/project.properties
+android/local.properties
+android/proguard-project.txt
+android/bin/
+android/gen/
+android/ant/build/
+android/ant/tasks.jar
+android/src/org/qtproject/
+android/src/org/kde/
diff --git a/android/.gitignore b/android/.gitignore
deleted file mode 100644
index 62a493fc..00000000
--- a/android/.gitignore
+++ /dev/null
@@ -1,16 +0,0 @@
-/libs/
-/assets/
-/res/drawable/
-/res/values/bundled_libs.xml
-/res/*/strings.xml
-/res/xml/device_filter.xml
-/build.xml
-/project.properties
-/local.properties
-/proguard-project.txt
-/bin/
-/gen/
-/ant/build/
-/ant/tasks.jar
-/src/org/qtproject/
-/src/org/kde/