chiark
/
gitweb
/
~mdw
/
disorder
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git.distorted.org.uk:~mdw/publish/public-git/disorder
[disorder]
/
.gitignore
diff --git
a/.gitignore
b/.gitignore
index 48dbf0ac339351f7a3dddc54b915b54753a00fe9..ccc94bfb11de92ecf7b9bdee14d8ca3829e68053 100644
(file)
--- a/
.gitignore
+++ b/
.gitignore
@@
-6,13
+6,7
@@
Makefile.in
/INSTALL
/aclocal.m4
/autom4te.cache
/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
,*
*.la
*.lo
,*
*.la
*.lo
@@
-31,11
+25,6
@@
clients/disorder
clients/disorderfm
clients/filename-bytes
clients/test-eclient
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
disobedience/Makefile
disobedience/disobedience
disobedience/style.h
@@
-60,6
+49,8
@@
doc/disorderd.8.html
doc/disorderfm.1
doc/disorderfm.1.html
doc/tkdisorder.1.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
driver/Makefile
examples/Makefile
examples/config.sample
@@
-136,8
+127,6
@@
lib/index.html
server/index.html
.DS_Store
tests/disorder-udplog
server/index.html
.DS_Store
tests/disorder-udplog
-lib/version-string
-lib/versionstring.h
scripts/setup
examples/disorder.rc
scripts/teardown
scripts/setup
examples/disorder.rc
scripts/teardown
@@
-184,7
+173,6
@@
doc/disorder_options.5
doc/disorder_options.5.html
doc/disorder_actions.5.in
doc/disorder_templates.5.in
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
libtests/t-charset
libtests/t-event
libtests/t-dateparse
@@
-205,6
+193,9
@@
clients/resample
disobedience/manual/Makefile
/m4
libtests/t-timeval
disobedience/manual/Makefile
/m4
libtests/t-timeval
+libtests/t-*.log
+libtests/t-*.trs
+libtests/test-suite.log
*.[oa]
*~
*.pyc
*.[oa]
*~
*.pyc
@@
-212,3
+203,16
@@
libtests/t-timeval
/GRTAGS
/GSYMS
/GTAGS
/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