]> code.delx.au - pulseaudio/commit
Merge remote branch 'origin/merge-queue'
authorLennart Poettering <lennart@poettering.net>
Thu, 5 Nov 2009 21:54:42 +0000 (22:54 +0100)
committerLennart Poettering <lennart@poettering.net>
Thu, 5 Nov 2009 21:54:42 +0000 (22:54 +0100)
commit4d62f159a74c6e5b46be5823483a7dedd5691b45
tree0a8c4d1865dca184b275963da556b352158f9878
parent721e32b473ca821d5551a3d93ac04f84c5988c8f
parent897ef86b7fbb87ef17d30c584e6cd93abfc342bc
Merge remote branch 'origin/merge-queue'

Conflicts:
src/pulsecore/sink-input.c
src/pulsecore/sink.c
src/pulsecore/sink-input.c
src/pulsecore/sink-input.h
src/pulsecore/sink.c