Merge commit 'coling/lgpl21'
authorLennart Poettering <lennart@poettering.net>
Tue, 3 Mar 2009 20:44:56 +0000 (21:44 +0100)
committerLennart Poettering <lennart@poettering.net>
Tue, 3 Mar 2009 20:44:56 +0000 (21:44 +0100)
1  2 
src/pulse/introspect.c
src/pulse/introspect.h
src/pulsecore/protocol-native.c
src/utils/pactl.c

Simple merge
Simple merge
Simple merge
Simple merge