summaryrefslogtreecommitdiffstats
path: root/src/.gitignore
diff options
context:
space:
mode:
authorTanu Kaskinen <tanuk@iki.fi>2009-08-24 14:43:11 +0300
committerTanu Kaskinen <tanuk@iki.fi>2009-08-24 14:43:11 +0300
commit2f3fc2f1d6ba418303a4bab6f8fd3caed7d291b4 (patch)
tree00bccb466ce49367f6fd54fe9f7f90557eea8738 /src/.gitignore
parent3025645b0b58f476f6404f2aed3b61a633794d10 (diff)
parentbe46eaa5b6324d84c5ecbed5dd72dec1c87e0cb1 (diff)
Merge branch 'master' of git://0pointer.de/pulseaudio into dbus-work
Conflicts: src/Makefile.am
Diffstat (limited to 'src/.gitignore')
-rw-r--r--src/.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/.gitignore b/src/.gitignore
index 82331524..6cd173c0 100644
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -1,3 +1,4 @@
+usergroup-test
sigbus-test
TAGS
alsa-time-test