diff options
| author | Max Kellermann <max@duempel.org> | 2012-09-25 11:39:01 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2012-09-25 11:39:01 +0200 |
| commit | e2a574e2a00803f45ed6f60154f01dd2ccc8444a (patch) | |
| tree | 7bb07fc285c00d01bd0d7fb1314c49ad39cb9232 /src/zeroconf-bonjour.c | |
| parent | 1536b5a9d602688354648106ca8d0e34cac3c933 (diff) | |
| parent | ba6ef53ef95dfd48ce0e5dd161b3199b431044ed (diff) | |
| download | mpd-e2a574e2a00803f45ed6f60154f01dd2ccc8444a.tar.gz mpd-e2a574e2a00803f45ed6f60154f01dd2ccc8444a.tar.xz mpd-e2a574e2a00803f45ed6f60154f01dd2ccc8444a.zip | |
Merge branch 'v0.17.x'
Conflicts:
src/locate.c
Diffstat (limited to 'src/zeroconf-bonjour.c')
0 files changed, 0 insertions, 0 deletions