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)
1  2 
src/pulse/volume.h

Simple merge