]> git.ipfire.org Git - thirdparty/tvheadend.git/commitdiff
Merge remote-tracking branch 'origin/pr/240'
authorAdam Sutton <dev@adamsutton.me.uk>
Fri, 1 Feb 2013 21:04:56 +0000 (21:04 +0000)
committerAdam Sutton <dev@adamsutton.me.uk>
Fri, 1 Feb 2013 21:04:56 +0000 (21:04 +0000)
1  2 
src/dvb/dvb_adapter.c

Simple merge