Only use one central .gitignore file.

[pulseview.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index a673c5f6e3bf388f12e61eb9925c5d18de83e8ec..d9ea23e33644137c668134e8f06b691e4cd95d95 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@
 
 pulseview
 pulseview-test
+libpulseview.so
 
 # CMake cruft
 *.cmake
@@ -26,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/