]> git.ipfire.org Git - thirdparty/tvheadend.git/commitdiff
projects / thirdparty / tvheadend.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6ac0912 02da03a)
Merge branch 'epg-rewrite' into initialscan
authorAdam Sutton <dev@adamsutton.me.uk>
Sat, 30 Jun 2012 11:35:17 +0000 (12:35 +0100)
committerAdam Sutton <dev@adamsutton.me.uk>
Sat, 30 Jun 2012 11:35:17 +0000 (12:35 +0100)

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