]> 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: 39e863d 1823651)
Merge branch 'master' into development
authorMike Brady <mikebrady@eircom.net>
Mon, 25 Apr 2016 07:11:03 +0000 (09:11 +0200)
committerMike Brady <mikebrady@eircom.net>
Mon, 25 Apr 2016 07:11:03 +0000 (09:11 +0200)
1  2 
shairport.c patch | diff1 | diff2 | blob | history

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