]> git.ipfire.org Git - thirdparty/tvheadend.git/commitdiff
projects / thirdparty / tvheadend.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ba2b7ee b81f748)
Merge branch 'epg-rewrite' into initialscan
authorAdam Sutton <dev@adamsutton.me.uk>
Mon, 2 Jul 2012 16:30:45 +0000 (17:30 +0100)
committerAdam Sutton <dev@adamsutton.me.uk>
Mon, 2 Jul 2012 16:30:45 +0000 (17:30 +0100)

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