]> code.delx.au - pulseaudio/commit
Merge branch 'master' of git://0pointer.de/pulseaudio into dbus-work
authorTanu Kaskinen <tanuk@iki.fi>
Sun, 30 Aug 2009 17:07:31 +0000 (20:07 +0300)
committerTanu Kaskinen <tanuk@iki.fi>
Sun, 30 Aug 2009 17:07:31 +0000 (20:07 +0300)
commit0ad2d55cbe86d13d5cd355f2b5d59360d681ccc2
tree42c290cd1f1c05c687d8134e40b63244d4fba4e9
parent0e096632c53b746b9f4b4c0249d9e5a18c1c543d
parent8bf2e3fe94e0dcd0a39a67c461b787d79adcd0dd
Merge branch 'master' of git://0pointer.de/pulseaudio into dbus-work

Conflicts:
src/modules/module-stream-restore.c
src/Makefile.am
src/modules/module-stream-restore.c
src/pulse/proplist.c
src/pulsecore/core-util.c
src/pulsecore/cpu-x86.h