]> git.ipfire.org Git - thirdparty/tvheadend.git/commit
Merge remote-tracking branch 'origin/pr/329'
authorAdam Sutton <dev@adamsutton.me.uk>
Wed, 5 Mar 2014 16:22:03 +0000 (16:22 +0000)
committerAdam Sutton <dev@adamsutton.me.uk>
Wed, 5 Mar 2014 16:22:03 +0000 (16:22 +0000)
commitae2ba4b6cd7398d71c2f5ef424a428e4b24082f7
tree666edc4db27fff40a2c6f543b1c5a69a8475d91c
parent9e25af9173a48d2e27b0a54bcce693a6d5ab2393
parent9e092a91bc354f6e101e36eff2a0f4edcda25f24
Merge remote-tracking branch 'origin/pr/329'

Conflicts:
src/tvheadend.h
src/channels.c
src/descrambler/capmt.c
src/input/mpegts/linuxdvb/linuxdvb.c
src/input/mpegts/linuxdvb/linuxdvb_adapter.c
src/input/mpegts/linuxdvb/linuxdvb_frontend.c
src/input/mpegts/linuxdvb/linuxdvb_private.h
src/input/mpegts/linuxdvb/linuxdvb_satconf.c
src/service_mapper.c
src/tvheadend.h
src/wrappers.c