]> git.ipfire.org Git - thirdparty/tvheadend.git/commitdiff
projects / thirdparty / tvheadend.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 48ee984 3b69376)
Merge branch 'http_service_stream' of https://github.com/john-tornblom/tvheadend...
authorAndreas Öman <andreas@lonelycoder.com>
Fri, 7 Jan 2011 13:41:59 +0000 (14:41 +0100)
committerAndreas Öman <andreas@lonelycoder.com>
Fri, 7 Jan 2011 13:41:59 +0000 (14:41 +0100)

Trivial merge
Mirror of https://github.com/tvheadend/tvheadend.git