aboutsummaryrefslogtreecommitdiffstats
path: root/src/zeroconf-bonjour.c
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2009-12-15 20:26:38 +0100
committerMax Kellermann <max@duempel.org>2009-12-15 20:26:38 +0100
commit530e480748854f43819c3dd1dbe6418c343b4f64 (patch)
tree488824927e465de0e55b8d10f6c03389f7deeeab /src/zeroconf-bonjour.c
parent95c3f283ea5a50a344b63af82718ac765229e8da (diff)
parent9179f108a540dcd27dafeb015778cc4dd873dfe5 (diff)
downloadmpd-530e480748854f43819c3dd1dbe6418c343b4f64.tar.gz
mpd-530e480748854f43819c3dd1dbe6418c343b4f64.tar.xz
mpd-530e480748854f43819c3dd1dbe6418c343b4f64.zip
Merge branch 'v0.15.x'
Conflicts: src/archive/bz2_plugin.c src/archive_api.h src/input/file_input_plugin.c test/run_input.c
Diffstat (limited to 'src/zeroconf-bonjour.c')
0 files changed, 0 insertions, 0 deletions