]> code.delx.au - pulseaudio/commitdiff
delx.au / code / pulseaudio / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0bc538b 1ca7603)
Merge branch 'master' into dbus-work
authorTanu Kaskinen <tanuk@iki.fi>
Mon, 29 Jun 2009 15:55:12 +0000 (18:55 +0300)
committerTanu Kaskinen <tanuk@iki.fi>
Mon, 29 Jun 2009 15:55:12 +0000 (18:55 +0300)
1  2 
configure.ac patch | diff1 | diff2 | blob | history
src/Makefile.am patch | diff1 | diff2 | blob | history
src/daemon/main.c patch | diff1 | diff2 | blob | history

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