From: Tanu Kaskinen <tanuk@iki.fi>
Date: Wed, 26 Aug 2009 11:29:55 +0000 (+0300)
Subject: Merge branch 'master' of git://0pointer.de/pulseaudio into dbus-work
X-Git-Tag: 1.0_branch~1178^2~6
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7bc8a793b8ae4c46e59a444313e4d06186de1680;p=profile%2Fivi%2Fpulseaudio.git

Merge branch 'master' of git://0pointer.de/pulseaudio into dbus-work

Conflicts:
	src/Makefile.am
---

7bc8a793b8ae4c46e59a444313e4d06186de1680
diff --cc src/Makefile.am
index c3ca1eb,e65662c..16834ee
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@@ -1253,7 -1250,7 +1254,8 @@@ SYMDEF_FILES = 
  		modules/module-augment-properties-symdef.h \
  		modules/module-cork-music-on-phone-symdef.h \
  		modules/module-console-kit-symdef.h \
- 		modules/dbus/module-dbus-protocol-symdef.h
++		modules/dbus/module-dbus-protocol-symdef.h \
+ 		modules/module-loopback-symdef.h
  
  EXTRA_DIST += $(SYMDEF_FILES)
  BUILT_SOURCES += $(SYMDEF_FILES)