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

[disorder] / .gitignore

diff --git a/.gitignore b/.gitignore
index 1e2f748ba99d30618a73ef64d9e4ec3783c61005..ccc94bfb11de92ecf7b9bdee14d8ca3829e68053 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -6,15 +6,8 @@ Makefile.in
 /INSTALL
 /aclocal.m4
 /autom4te.cache
-config.aux/config.guess
-config.aux/config.sub
-config.aux/depcomp
-config.aux/install-sh
-config.aux/ltmain.sh
-config.aux/missing
-config.aux/py-compile
+config.aux
 ,*
-ChangeLog.d/bzr-changelog
 *.la
 *.lo
 .deps
@@ -32,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
@@ -61,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
@@ -82,7 +72,6 @@ server/disorderd
 server/trackname
 sounds/Makefile
 templates/Makefile
-.bzr.backup
 doc/disorder-speaker.8.html
 .gdb_history
 core
@@ -138,8 +127,6 @@ lib/index.html
 server/index.html
 .DS_Store
 tests/disorder-udplog
-lib/version-string
-lib/versionstring.h
 scripts/setup
 examples/disorder.rc
 scripts/teardown
@@ -186,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,4 +193,26 @@ clients/resample
 disobedience/manual/Makefile
 /m4
 libtests/t-timeval
+libtests/t-*.log
+libtests/t-*.trs
+libtests/test-suite.log
 *.[oa]
+*~
+*.pyc
+/GPATH
+/GRTAGS
+/GSYMS
+/GTAGS
+debian/disorder-gstreamer
+server/disorder-gstdecode
+/Debug
+/lib/Debug
+/clients/Debug
+*.suo
+*.sdf
+*.opensdf
+*.vcxproj.user
+.dirstamp
+tests/*.trs
+/common/Makefile
+libtests/t-salsa208