]> code.delx.au - pulseaudio/commitdiff
delx.au / code / pulseaudio / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 692ce73 e895200)
Merge remote branch 'phish3/master'
authorLennart Poettering <lennart@poettering.net>
Wed, 7 Oct 2009 01:43:24 +0000 (03:43 +0200)
committerLennart Poettering <lennart@poettering.net>
Wed, 7 Oct 2009 01:43:24 +0000 (03:43 +0200)
1  2 
configure.ac patch | diff1 | diff2 | blob | history
src/Makefile.am patch | diff1 | diff2 | blob | history

diff --cc configure.ac
Simple merge
diff --cc src/Makefile.am
Simple merge