]> code.delx.au - pulseaudio/commitdiff
delx.au / code / pulseaudio / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0225ef6 3d6278b)
Merge branch 'master' of ssh://rootserver/home/lennart/git/public/pulseaudio
authorLennart Poettering <lennart@poettering.net>
Thu, 23 Jul 2009 13:18:06 +0000 (15:18 +0200)
committerLennart Poettering <lennart@poettering.net>
Thu, 23 Jul 2009 13:18:06 +0000 (15:18 +0200)
Conflicts:
src/daemon/main.c

1  2 
src/daemon/main.c patch | diff1 | diff2 | blob | history

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