]> code.delx.au - pulseaudio/commitdiff
delx.au / code / pulseaudio / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 923c5bc ca39fa2)
Merge branch 'master' of ssh://rootserver/home/lennart/git/public/pulseaudio
authorLennart Poettering <lennart@poettering.net>
Sun, 5 Apr 2009 01:05:51 +0000 (03:05 +0200)
committerLennart Poettering <lennart@poettering.net>
Sun, 5 Apr 2009 01:05:51 +0000 (03:05 +0200)
1  2 
src/modules/alsa/alsa-sink.c patch | diff1 | diff2 | blob | history
src/modules/alsa/alsa-source.c patch | diff1 | diff2 | blob | history
src/modules/rtp/module-rtp-recv.c patch | diff1 | diff2 | blob | history
src/pulse/internal.h patch | diff1 | diff2 | blob | history

diff --cc src/modules/alsa/alsa-sink.c
Simple merge
diff --cc src/modules/alsa/alsa-source.c
Simple merge
diff --cc src/modules/rtp/module-rtp-recv.c
Simple merge
diff --cc src/pulse/internal.h
Simple merge