Merge commit 'elmarco/dbus'
authorLennart Poettering <lennart@poettering.net>
Mon, 30 Mar 2009 18:26:27 +0000 (20:26 +0200)
committerLennart Poettering <lennart@poettering.net>
Mon, 30 Mar 2009 18:26:27 +0000 (20:26 +0200)
commitd33be12fde0910e4a7515c3f6a8b8f2165624cb0
tree43b62e47c2a673eeabca86136a3c73aa6233e1fc
parent649c982222f520fdd4afae8880c622437d4ba585
parent8491b47a5164fdff10724bfe74411791dc0ff912
Merge commit 'elmarco/dbus'
src/pulse/context.c
src/pulse/def.h
src/pulse/internal.h