summaryrefslogtreecommitdiffstats
path: root/src/modules/dbus/iface-core.c
diff options
context:
space:
mode:
authorTanu Kaskinen <tanuk@iki.fi>2009-08-30 20:07:31 +0300
committerTanu Kaskinen <tanuk@iki.fi>2009-08-30 20:07:31 +0300
commit0ad2d55cbe86d13d5cd355f2b5d59360d681ccc2 (patch)
tree42c290cd1f1c05c687d8134e40b63244d4fba4e9 /src/modules/dbus/iface-core.c
parent0e096632c53b746b9f4b4c0249d9e5a18c1c543d (diff)
parent8bf2e3fe94e0dcd0a39a67c461b787d79adcd0dd (diff)
Merge branch 'master' of git://0pointer.de/pulseaudio into dbus-work
Conflicts: src/modules/module-stream-restore.c
Diffstat (limited to 'src/modules/dbus/iface-core.c')
0 files changed, 0 insertions, 0 deletions