From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 8 Oct 2008 21:03:16 +0000 (+0200)
Subject: Merge commit 'coling/airtunes-0.9.13'
X-Git-Tag: submit/2.0-panda/20130828.192557~2586
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8e3e88df8b4f9eb82d305e04b23b22574fb7847d;p=profile%2Fivi%2Fpulseaudio-panda.git

Merge commit 'coling/airtunes-0.9.13'
---

8e3e88df8b4f9eb82d305e04b23b22574fb7847d
diff --cc src/Makefile.am
index 7487839,f216b71..4d1812e
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@@ -1234,10 -1261,11 +1262,12 @@@ SYMDEF_FILES = 
  		modules/bluetooth/module-bluetooth-proximity-symdef.h \
  		modules/bluetooth/module-bluetooth-discover-symdef.h \
  		modules/bluetooth/module-bluetooth-device-symdef.h \
+ 		modules/module-raop-sink-symdef.h \
+ 		modules/module-raop-discover-symdef.h \
  		modules/gconf/module-gconf-symdef.h \
  		modules/module-position-event-sounds-symdef.h \
 -		modules/module-console-kit-symdef.h
 +		modules/module-console-kit-symdef.h \
 +		modules/module-flat-volume-symdef.h
  
  EXTRA_DIST += $(SYMDEF_FILES)
  BUILT_SOURCES += $(SYMDEF_FILES)