diff options
| author | Tanu Kaskinen <tanuk@iki.fi> | 2009-08-26 14:29:55 +0300 |
|---|---|---|
| committer | Tanu Kaskinen <tanuk@iki.fi> | 2009-08-26 14:29:55 +0300 |
| commit | 7bc8a793b8ae4c46e59a444313e4d06186de1680 (patch) | |
| tree | 6abd784d94df0e8eef5811dd65f6bda21ca9f554 /src/pulsecore/protocol-dbus.c | |
| parent | 219f7508f6420f94ad8c426c6aa3dc79df246f36 (diff) | |
| parent | 4614412f94eef8ed65076c6fc76b463547f8f072 (diff) | |
Merge branch 'master' of git://0pointer.de/pulseaudio into dbus-work
Conflicts:
src/Makefile.am
Diffstat (limited to 'src/pulsecore/protocol-dbus.c')
0 files changed, 0 insertions, 0 deletions