repositories / deb_shairplay.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 00bd24d 64d59e3)
Merge branch 'master' of https://github.com/juhovh/shairplay into upstream
authorJérôme Benoit <jerome.benoit@piment-noir.org>
Tue, 25 Nov 2014 23:43:23 +0000 (00:43 +0100)
committerJérôme Benoit <jerome.benoit@piment-noir.org>
Tue, 25 Nov 2014 23:43:23 +0000 (00:43 +0100)
commitdd28c44f7f25627039b067c2d4f4b40e6a228ab4
tree0267811765de8d6ce6448267c15956f7385ee3bbtree | snapshot (zip tar.gz tar.bz2)
parent00bd24db775c9db500834677db929cd319621f0dcommit | diff
parent64d59e3087f829006d091fa0d114efb50972a2bfcommit | diff
Merge branch 'master' of https://github.com/juhovh/shairplay into upstream

Signed-off-by: Jérôme Benoit <jerome.benoit@piment-noir.org>
Conflicts:
.gitignore
README.md
configure.ac
src/lib/digest.c
src/lib/dnssd.c
src/lib/httpd.c
src/lib/netutils.c
src/lib/raop.c
src/lib/raop_buffer.c
src/shairplay.c
src/test/example.c
src/lib/raop.c diff1 | diff2 | blob | history
shairplay Piment Noir Debian package repository