code.delx.au - pulseaudio/commit

]> code.delx.au - pulseaudio/commit

delx.au / code / pulseaudio / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 3025645 be46eaa)

author	Tanu Kaskinen <tanuk@iki.fi>
	Mon, 24 Aug 2009 11:43:11 +0000 (14:43 +0300)
committer	Tanu Kaskinen <tanuk@iki.fi>
	Mon, 24 Aug 2009 11:43:11 +0000 (14:43 +0300)
commit	2f3fc2f1d6ba418303a4bab6f8fd3caed7d291b4
tree	00bccb466ce49367f6fd54fe9f7f90557eea8738	tree
parent	3025645b0b58f476f6404f2aed3b61a633794d10	commit \| diff
parent	be46eaa5b6324d84c5ecbed5dd72dec1c87e0cb1	commit \| diff

Merge branch 'master' of git://0pointer.de/pulseaudio into dbus-work

Conflicts:
src/Makefile.am

configure.ac	diff1 \|	diff2 \|	blob \| history
src/Makefile.am	diff1 \|	diff2 \|	blob \| history
src/daemon/daemon-conf.c	diff1 \|	diff2 \|	blob \| history
src/daemon/main.c	diff1 \|	diff2 \|	blob \| history
src/pulsecore/core-util.c	diff1 \|	diff2 \|	blob \| history
src/pulsecore/core-util.h	diff1 \|	diff2 \|	blob \| history
src/pulsecore/core.h	diff1 \|	diff2 \|	blob \| history
src/pulsecore/cpu-arm.h	\|	diff2 \|	blob \| history
src/pulsecore/cpu-x86.h	\|	diff2 \|	blob \| history