Merge branch 'master' of git://0pointer.de/pulseaudio into dbus-work
authorTanu Kaskinen <tanuk@iki.fi>
Mon, 24 Aug 2009 11:43:11 +0000 (14:43 +0300)
committerTanu Kaskinen <tanuk@iki.fi>
Mon, 24 Aug 2009 11:43:11 +0000 (14:43 +0300)
commit2f3fc2f1d6ba418303a4bab6f8fd3caed7d291b4
tree00bccb466ce49367f6fd54fe9f7f90557eea8738
parent3025645b0b58f476f6404f2aed3b61a633794d10
parentbe46eaa5b6324d84c5ecbed5dd72dec1c87e0cb1
Merge branch 'master' of git://0pointer.de/pulseaudio into dbus-work

Conflicts:
src/Makefile.am
configure.ac
src/Makefile.am
src/daemon/daemon-conf.c
src/daemon/main.c
src/pulsecore/core-util.c
src/pulsecore/core-util.h
src/pulsecore/core.h
src/pulsecore/cpu-arm.h
src/pulsecore/cpu-x86.h