]> code.delx.au - pulseaudio/commit
Merge branch 'master' of git://0pointer.de/pulseaudio into dbus-work
authorTanu Kaskinen <tanuk@iki.fi>
Sun, 16 Aug 2009 18:25:48 +0000 (21:25 +0300)
committerTanu Kaskinen <tanuk@iki.fi>
Sun, 16 Aug 2009 18:25:48 +0000 (21:25 +0300)
commitbcaba0b1b43d6a1b32aadfa98860f40b2c93e136
tree6bd0d60a8fa822bfd688b90d062d0f73eee2e47e
parent2bb3eef414f80189cf6af6cd66c519630e4c0a43
parent01e4b61a910afdd21f860fadbe98075735c2bf51
Merge branch 'master' of git://0pointer.de/pulseaudio into dbus-work

Conflicts:
src/Makefile.am
src/daemon/daemon-conf.c
src/daemon/daemon.conf.in
src/modules/module-stream-restore.c
src/pulse/client-conf.c
src/pulsecore/namereg.c
15 files changed:
configure.ac
po/es.po
po/pt_BR.po
src/Makefile.am
src/daemon/daemon-conf.c
src/daemon/daemon.conf.in
src/daemon/main.c
src/map-file
src/modules/module-stream-restore.c
src/pulse/client-conf.c
src/pulse/client.conf.in
src/pulsecore/core-util.c
src/pulsecore/core-util.h
src/pulsecore/dbus-util.c
src/pulsecore/namereg.c