]> git.ipfire.org Git - thirdparty/tvheadend.git/commit
Merge remote-tracking branch 'origin/pr/318'
authorAdam Sutton <dev@adamsutton.me.uk>
Sat, 11 Jan 2014 00:48:06 +0000 (00:48 +0000)
committerAdam Sutton <dev@adamsutton.me.uk>
Sat, 11 Jan 2014 00:48:06 +0000 (00:48 +0000)
commit07ad772e7092fb34899a50c7c2737419f38292b4
tree69f0285854b49a4b349944374dda8145c6a9e989
parent9addc4e82b12c49e9fff741e13f9c54e1124ddce
parent88f0dbba2e3558c829a7a82b72da83eb736e82b8
Merge remote-tracking branch 'origin/pr/318'

Conflicts:
src/input/mpegts/linuxdvb/linuxdvb_satconf.c
Makefile
src/input/mpegts/linuxdvb/linuxdvb.c
src/input/mpegts/linuxdvb/linuxdvb_private.h
src/input/mpegts/linuxdvb/linuxdvb_satconf.c