]> git.ipfire.org Git - thirdparty/tvheadend.git/commitdiff
projects / thirdparty / tvheadend.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 933417b dacde57)
Merge branch 'epg-rewrite' into initialscan
authorAdam Sutton <dev@adamsutton.me.uk>
Sun, 1 Jul 2012 20:02:53 +0000 (21:02 +0100)
committerAdam Sutton <dev@adamsutton.me.uk>
Sun, 1 Jul 2012 20:02:53 +0000 (21:02 +0100)

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