Merge branch 'master' of git.distorted.org.uk:~mdw/publish/public-git/disorder

[disorder] / .gitignore

diff --git a/.gitignore b/.gitignore
index dc150c38c6afe3cf7c531cd483939b543cab60d6..ccc94bfb11de92ecf7b9bdee14d8ca3829e68053 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -25,11 +25,6 @@ clients/disorder
 clients/disorderfm
 clients/filename-bytes
 clients/test-eclient
-debian/Makefile
-debian/disorder
-debian/files
-debian/rules
-debian/substvars.disorder
 disobedience/Makefile
 disobedience/disobedience
 disobedience/style.h
@@ -54,6 +49,8 @@ doc/disorderd.8.html
 doc/disorderfm.1
 doc/disorderfm.1.html
 doc/tkdisorder.1.html
+doc/disorder-gstdecode.8
+doc/disorder-gstdecode.8.html
 driver/Makefile
 examples/Makefile
 examples/config.sample
@@ -176,7 +173,6 @@ doc/disorder_options.5
 doc/disorder_options.5.html
 doc/disorder_actions.5.in
 doc/disorder_templates.5.in
-libtests/t-arcfour
 libtests/t-charset
 libtests/t-event
 libtests/t-dateparse
@@ -207,6 +203,8 @@ libtests/test-suite.log
 /GRTAGS
 /GSYMS
 /GTAGS
+debian/disorder-gstreamer
+server/disorder-gstdecode
 /Debug
 /lib/Debug
 /clients/Debug
@@ -214,3 +212,7 @@ libtests/test-suite.log
 *.sdf
 *.opensdf
 *.vcxproj.user
+.dirstamp
+tests/*.trs
+/common/Makefile
+libtests/t-salsa208