]> git.ipfire.org Git - thirdparty/tvheadend.git/commitdiff
projects / thirdparty / tvheadend.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d78a36c f6ee30c)
Merge remote-tracking branch 'origin/pr/236'
authorAdam Sutton <dev@adamsutton.me.uk>
Thu, 31 Jan 2013 10:35:51 +0000 (10:35 +0000)
committerAdam Sutton <dev@adamsutton.me.uk>
Thu, 31 Jan 2013 10:35:51 +0000 (10:35 +0000)
1  2 
src/channels.c patch | diff1 | diff2 | blob | history
src/dvr/dvr_db.c patch | diff1 | diff2 | blob | history
src/dvr/dvr_rec.c patch | diff1 | diff2 | blob | history

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