]> code.delx.au - pulseaudio/commitdiff
delx.au / code / pulseaudio / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b4e0d5d f4f16ab)
Merge branch 'master' of git://0pointer.de/pulseaudio into dbus-work
authorTanu Kaskinen <tanuk@iki.fi>
Wed, 19 Aug 2009 06:20:02 +0000 (09:20 +0300)
committerTanu Kaskinen <tanuk@iki.fi>
Wed, 19 Aug 2009 06:20:02 +0000 (09:20 +0300)
1  2 
src/map-file patch | diff1 | diff2 | blob | history
src/pulsecore/core.h patch | diff1 | diff2 | blob | history

diff --cc src/map-file
Simple merge
diff --cc src/pulsecore/core.h
Simple merge