diff options
| author | Lennart Poettering <lennart@poettering.net> | 2009-07-23 15:18:06 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2009-07-23 15:18:06 +0200 |
| commit | 88d5749f6ae8d391963a12a6221f006de2947e50 (patch) | |
| tree | f1de05b054b1ee8b272804a03b621a1dde1d8416 /src/daemon/default.pa.in | |
| parent | 0225ef68f2876bebd14977882db313fd7f3f6d64 (diff) | |
| parent | 3d6278bc31aa7053f1228b3d874ba36f50a8c2d5 (diff) | |
Merge branch 'master' of ssh://rootserver/home/lennart/git/public/pulseaudio
Conflicts:
src/daemon/main.c
Diffstat (limited to 'src/daemon/default.pa.in')
0 files changed, 0 insertions, 0 deletions