Merge branch 'master' of ssh://rootserver/home/lennart/git/public/pulseaudio

This commit is contained in:
Lennart Poettering 2009-04-03 17:50:37 +02:00
commit 6152c52420
10 changed files with 60 additions and 46 deletions

View file

@ -58,9 +58,9 @@ load-module module-detect
.endif
### Automatically load driver modules for Bluetooth hardware
#.ifexists module-bluetooth-discover@PA_SOEXT@
.ifexists module-bluetooth-discover@PA_SOEXT@
load-module module-bluetooth-discover
#.endif
.endif
### Load several protocols
.ifexists module-esound-protocol-unix@PA_SOEXT@