summaryrefslogtreecommitdiffstats
path: root/src/pulse/glib-mainloop.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2007-10-28 19:13:50 +0000
committerLennart Poettering <lennart@poettering.net>2007-10-28 19:13:50 +0000
commita67c21f093202f142438689d3f7cfbdf4ea82eea (patch)
tree5c3295037f033904bc11ab8b3adae5b7331101e9 /src/pulse/glib-mainloop.c
parent6687dd013169fd8436aa1b45ccdacff074a40d05 (diff)
merge 'lennart' branch back into trunk.
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@1971 fefdeb5f-60dc-0310-8127-8f9354f1896f
Diffstat (limited to 'src/pulse/glib-mainloop.c')
-rw-r--r--src/pulse/glib-mainloop.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/pulse/glib-mainloop.c b/src/pulse/glib-mainloop.c
index 5b399aa2..b7a7537a 100644
--- a/src/pulse/glib-mainloop.c
+++ b/src/pulse/glib-mainloop.c
@@ -25,8 +25,6 @@
#include <config.h>
#endif
-#include <assert.h>
-
#include <pulse/xmalloc.h>
#include <pulse/timeval.h>