summaryrefslogtreecommitdiffstats
path: root/src/.gitignore
diff options
context:
space:
mode:
authorColin Guthrie <pulse@colin.guthr.ie>2008-07-30 23:43:45 +0100
committerColin Guthrie <pulse@colin.guthr.ie>2008-07-30 23:43:45 +0100
commitb30a5d601eaffd98914ca0b9fdecd863eade0b4f (patch)
tree2bf5dfaa46b8e1733311562dba299709a0a3228e /src/.gitignore
parent0e1936fd56ad51509424f3eca06fe3a442b4dc9c (diff)
parent0b428e7cb1efdd7330b89a9855f08c45bfa98307 (diff)
Merge branch 'master' of git://git.0pointer.de/pulseaudio
Diffstat (limited to 'src/.gitignore')
-rw-r--r--src/.gitignore2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/.gitignore b/src/.gitignore
index f3ed2e2e..6902eb9f 100644
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -15,6 +15,7 @@ cpulimit-test
cpulimit-test2
daemon.conf
default.pa
+system.pa
envelope-test
esdcompat
flist-test
@@ -54,3 +55,4 @@ thread-mainloop-test
thread-test
utf8-test
voltest
+start-pulseaudio-x11