Merge commit 'e0f8ffe41f99789fafac575e944acf02e940bbf7'
authorLennart Poettering <lennart@poettering.net>
Thu, 15 Jan 2009 18:19:45 +0000 (19:19 +0100)
committerLennart Poettering <lennart@poettering.net>
Thu, 15 Jan 2009 18:19:45 +0000 (19:19 +0100)
commita861ffacc490c690da8f05077be1efb7d4e2895c
tree5b52dec253ba5eac73e6cccc8013701ea91949b8
parentd2757c9842312687f0cb07380a823ce39849a2b2
parente0f8ffe41f99789fafac575e944acf02e940bbf7
Merge commit 'e0f8ffe41f99789fafac575e944acf02e940bbf7'
src/pulsecore/sink.c
src/pulsecore/sink.h