]> code.delx.au - pulseaudio/commitdiff
delx.au / code / pulseaudio / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ec78981 5f69b5d)
Merge branch 'master' of git://git.0pointer.de/pulseaudio
authorColin Guthrie <pulse@colin.guthr.ie>
Sun, 3 Aug 2008 22:38:44 +0000 (23:38 +0100)
committerColin Guthrie <pulse@colin.guthr.ie>
Sun, 3 Aug 2008 22:38:44 +0000 (23:38 +0100)
1  2 
src/Makefile.am patch | diff1 | diff2 | blob | history

diff --cc src/Makefile.am
Simple merge