Merge branch 'master' of git://git.0pointer.de/pulseaudio
authorColin Guthrie <pulse@colin.guthr.ie>
Fri, 22 Aug 2008 09:56:45 +0000 (10:56 +0100)
committerColin Guthrie <pulse@colin.guthr.ie>
Fri, 22 Aug 2008 09:56:45 +0000 (10:56 +0100)
commit4282b726ee57ebae846ce400fd1cae43c4dfb2ae
tree2cb32c3bc52a9b9eab50a6195f3ccb190332f7d8
parentbf17dbb101d509e885bf689f4f13f75e4b3ab58d
parentdc9b8dce309728b47059b9b44fd3bbd3798667ae
Merge branch 'master' of git://git.0pointer.de/pulseaudio
src/pulse/volume.h