diff options
author | Max Kellermann <max@duempel.org> | 2011-01-07 23:52:23 +0100 |
---|---|---|
committer | Max Kellermann <max@duempel.org> | 2011-01-07 23:52:23 +0100 |
commit | 1a2ea4c06cd9fd648bb0243a0dfd9e0b960a6788 (patch) | |
tree | 8a13ed86728b59caebd86dc7a1287c234b4985f1 /src/zeroconf-bonjour.c | |
parent | a800afcbf8845df0edc6aee3bb48036bba34e255 (diff) | |
parent | 8c0afd8557b1823e2df94c9f4de90c29eafbf035 (diff) | |
download | mpd-1a2ea4c06cd9fd648bb0243a0dfd9e0b960a6788.tar.gz mpd-1a2ea4c06cd9fd648bb0243a0dfd9e0b960a6788.tar.xz mpd-1a2ea4c06cd9fd648bb0243a0dfd9e0b960a6788.zip |
Merge branch 'v0.16.x'
Conflicts:
NEWS
configure.ac
Diffstat (limited to 'src/zeroconf-bonjour.c')
0 files changed, 0 insertions, 0 deletions