]> git.ipfire.org Git - thirdparty/shairport-sync.git/commitdiff
projects / thirdparty / shairport-sync.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2c74e7d e0ecdac)
Fix a small conflict in mdns_avahi.c
authorMike Brady <mikebrady@eircom.net>
Mon, 4 Dec 2017 08:48:04 +0000 (08:48 +0000)
committerMike Brady <mikebrady@eircom.net>
Mon, 4 Dec 2017 08:48:04 +0000 (08:48 +0000)
1  2 
configure.ac patch | diff1 | diff2 | blob | history
mdns_avahi.c patch | diff1 | diff2 | blob | history

diff --cc configure.ac
Simple merge
diff --cc mdns_avahi.c
Simple merge
Mirror of https://github.com/mikebrady/shairport-sync.git