Merge branch 'osx' of git://gitorious.org/~flameeyes/pulseaudio/flameeyes-pulseaudio
authorDaniel Mack <daniel@caiaq.de>
Fri, 17 Jul 2009 19:06:58 +0000 (21:06 +0200)
committerDaniel Mack <daniel@caiaq.de>
Fri, 17 Jul 2009 19:06:58 +0000 (21:06 +0200)
commitc6d330ef91ce401660f907536b1bfd0591c14c2a
tree44684b85773315a66d7d92c910aa28463f76e0f6
parent63f2ed6dd7b4b87dbe175f8dda35204dee8737e0
parentd18eb61bd2fe5940bccc2b5fcda4029159021d00
Merge branch 'osx' of git://gitorious.org/~flameeyes/pulseaudio/flameeyes-pulseaudio