repositories / deb_shairplay.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e11d53a 8261a84)
Merge branch 'upstream'
authorJérôme Benoit <jerome.benoit@piment-noir.org>
Wed, 26 Nov 2014 00:58:03 +0000 (01:58 +0100)
committerJérôme Benoit <jerome.benoit@piment-noir.org>
Wed, 26 Nov 2014 00:58:03 +0000 (01:58 +0100)
Signed-off-by: Jérôme Benoit <jerome.benoit@piment-noir.org>
Conflicts:
configure


Trivial merge
shairplay Piment Noir Debian package repository