projects
/
platform
/
upstream
/
pulseaudio.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
219f750
4614412
)
Merge branch 'master' of git://0pointer.de/pulseaudio into dbus-work
author
Tanu Kaskinen
<tanuk@iki.fi>
Wed, 26 Aug 2009 11:29:55 +0000
(14:29 +0300)
committer
Tanu Kaskinen
<tanuk@iki.fi>
Wed, 26 Aug 2009 11:29:55 +0000
(14:29 +0300)
Conflicts:
src/Makefile.am
1
2
src/Makefile.am
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/Makefile.am
index
c3ca1eb
,
e65662c
..
16834ee
---
1
/
src/Makefile.am
---
2
/
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)