]> git.ipfire.org Git - thirdparty/tvheadend.git/commitdiff
projects / thirdparty / tvheadend.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c680413 416e468)
Merge branch 'epg-rewrite' into epg-opentv
authorAdam Sutton <dev@adamsutton.me.uk>
Mon, 18 Jun 2012 22:23:57 +0000 (23:23 +0100)
committerAdam Sutton <dev@adamsutton.me.uk>
Mon, 18 Jun 2012 22:23:57 +0000 (23:23 +0100)
1  2 
src/epg.c patch | diff1 | diff2 | blob | history

diff --cc src/epg.c
Simple merge
Mirror of https://github.com/tvheadend/tvheadend.git