]> code.delx.au - pulseaudio/commitdiff
Merge commit 'coling/master'
authorLennart Poettering <lennart@poettering.net>
Tue, 30 Sep 2008 23:52:14 +0000 (01:52 +0200)
committerLennart Poettering <lennart@poettering.net>
Tue, 30 Sep 2008 23:52:14 +0000 (01:52 +0200)
1  2 
src/Makefile.am

diff --cc src/Makefile.am
Simple merge