]> git.ipfire.org Git - thirdparty/tvheadend.git/commitdiff
projects / thirdparty / tvheadend.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ec18ddc b29b6eb)
Merge branch 'master' into epg-rewrite
authorAdam Sutton <dev@adamsutton.me.uk>
Fri, 25 May 2012 16:33:02 +0000 (17:33 +0100)
committerAdam Sutton <dev@adamsutton.me.uk>
Fri, 25 May 2012 16:33:02 +0000 (17:33 +0100)
1  2 
src/dvr/dvr_db.c patch | diff1 | diff2 | blob | history

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