]> code.delx.au - pulseaudio/commitdiff
delx.au / code / pulseaudio / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d6fb8d1 6076cef)
Merge commit 'wtay/optimize'
authorLennart Poettering <lennart@poettering.net>
Sat, 22 Aug 2009 22:06:35 +0000 (00:06 +0200)
committerLennart Poettering <lennart@poettering.net>
Sat, 22 Aug 2009 22:06:35 +0000 (00:06 +0200)
1  2 
src/Makefile.am patch | diff1 | diff2 | blob | history
src/daemon/main.c patch | diff1 | diff2 | blob | history

diff --cc src/Makefile.am
Simple merge
diff --cc src/daemon/main.c
Simple merge