]> code.delx.au - pulseaudio/commitdiff
delx.au / code / pulseaudio / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7c78c3f 05b7440)
Merge commit 'elmarco/legacy-dir'
authorLennart Poettering <lennart@poettering.net>
Thu, 19 Feb 2009 04:02:52 +0000 (05:02 +0100)
committerLennart Poettering <lennart@poettering.net>
Thu, 19 Feb 2009 04:02:52 +0000 (05:02 +0100)
1  2 
configure.ac patch | diff1 | diff2 | blob | history
src/pulse/context.c patch | diff1 | diff2 | blob | history

diff --cc configure.ac
Simple merge
diff --cc src/pulse/context.c
Simple merge