]> git.ipfire.org Git - thirdparty/tvheadend.git/commitdiff
projects / thirdparty / tvheadend.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4f3d858 2a43777)
Merge remote-tracking branch 'origin/pr/345'
authorAdam Sutton <dev@adamsutton.me.uk>
Fri, 4 Apr 2014 14:56:13 +0000 (15:56 +0100)
committerAdam Sutton <dev@adamsutton.me.uk>
Fri, 4 Apr 2014 14:56:13 +0000 (15:56 +0100)
1  2 
src/channels.c patch | diff1 | diff2 | blob | history
src/dvr/dvr.h patch | diff1 | diff2 | blob | history
src/dvr/dvr_db.c patch | diff1 | diff2 | blob | history

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