Merge branch 'master' of ssh://rootserver/home/lennart/git/public/pulseaudio
authorLennart Poettering <lennart@poettering.net>
Sun, 5 Apr 2009 01:05:51 +0000 (03:05 +0200)
committerLennart Poettering <lennart@poettering.net>
Sun, 5 Apr 2009 01:05:51 +0000 (03:05 +0200)
commit6ba3333030fa44fe43e3795be8af7473113f6109
treebaf9da64166d23cfe047264eb4eb3144d1014f34
parent923c5bc5bfba15399649ebc50807c27765102e6e
parentca39fa2c6f9036a4c90804625842f6af38fb8008
Merge branch 'master' of ssh://rootserver/home/lennart/git/public/pulseaudio
src/modules/alsa/alsa-sink.c
src/modules/alsa/alsa-source.c
src/modules/rtp/module-rtp-recv.c
src/pulse/internal.h