summaryrefslogtreecommitdiffstats
path: root/src/.gitignore
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2008-07-31 23:34:09 +0300
committerLennart Poettering <lennart@poettering.net>2008-07-31 23:34:09 +0300
commitd757dc7ff47a47d760cc5959579b010fb5a8b214 (patch)
treefbf258c55e7da38c66b2585542f241bb473d7ab7 /src/.gitignore
parent297267b9c4e297cc1c26dbc1e6d0be476443f128 (diff)
parent80428d80b03b3c26bd25169fa4083e16cf6bfafc (diff)
Merge branch 'master' of ssh://rootserver/home/lennart/git/public/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