]> code.delx.au - pulseaudio/commitdiff
delx.au / code / pulseaudio / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5cb29f3 3e5d9fd)
Merge commit 'flameeyes/flameeyes'
authorLennart Poettering <lennart@poettering.net>
Fri, 23 Jan 2009 18:46:52 +0000 (19:46 +0100)
committerLennart Poettering <lennart@poettering.net>
Fri, 23 Jan 2009 18:46:52 +0000 (19:46 +0100)
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