aboutsummaryrefslogtreecommitdiffstats
path: root/src/zeroconf.h
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2012-02-04 17:23:53 +0100
committerMax Kellermann <max@duempel.org>2012-02-04 17:23:53 +0100
commitc46239af22aa943af96eb6a580b00a253d7ba4f8 (patch)
tree5b925e3af53b355c3b7e24b8e603b0b619d134b8 /src/zeroconf.h
parentef5cf40fa6d3e2f50ad916be8e5bd99affe7d2e3 (diff)
parent48eb3ff8d993e4d6977898ccec1d9377b7397f16 (diff)
downloadmpd-c46239af22aa943af96eb6a580b00a253d7ba4f8.tar.gz
mpd-c46239af22aa943af96eb6a580b00a253d7ba4f8.tar.xz
mpd-c46239af22aa943af96eb6a580b00a253d7ba4f8.zip
Merge branch 'v0.16.x'
Conflicts: src/decoder/ffmpeg_decoder_plugin.c test/read_tags.c test/run_decoder.c
Diffstat (limited to 'src/zeroconf.h')
0 files changed, 0 insertions, 0 deletions