]> git.ipfire.org Git - thirdparty/tvheadend.git/commitdiff
projects / thirdparty / tvheadend.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8b8876d eaec342)
Merge remote-tracking branch 'origin/pr/242'
authorAdam Sutton <dev@adamsutton.me.uk>
Fri, 15 Feb 2013 11:16:56 +0000 (11:16 +0000)
committerAdam Sutton <dev@adamsutton.me.uk>
Fri, 15 Feb 2013 11:16:56 +0000 (11:16 +0000)
1  2 
src/main.c patch | diff1 | diff2 | blob | history

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