Merge branch 'master' of ssh://rootserver/home/lennart/git/public/pulseaudio
authorLennart Poettering <lennart@poettering.net>
Fri, 20 Feb 2009 02:21:46 +0000 (03:21 +0100)
committerLennart Poettering <lennart@poettering.net>
Fri, 20 Feb 2009 02:21:46 +0000 (03:21 +0100)
commit7bc1847596bdedea6a06c8c0a019da773476a965
tree521be5207d649ff24f022c9bfe31a716a2674317
parent26a270a934f0f174f7bd7eb89e85301963721deb
parent2e250aaebb7708b25b5342d8ced657364adedc95
Merge branch 'master' of ssh://rootserver/home/lennart/git/public/pulseaudio
src/modules/alsa/alsa-util.c
src/modules/bluetooth/module-bluetooth-device.c