mpmc / tvheadend

Tvheadend is a TV streaming server for Linux supporting DVB-S, DVB-S2, DVB-C, DVB-T, ATSC, IPTV,SAT>IP and other formats through the unix pipe as input sources.
https://tvheadend.org
Other
0 stars 2 forks source link

Update from upstream repo tvheadend/tvheadend@master #41

Closed backstroke-bot closed 7 years ago

backstroke-bot commented 7 years ago

Hello! The remote tvheadend/tvheadend@master has some new changes that aren't in this fork. So, here they are, ready to be merged! :tada:

If this pull request can be merged without conflict, you can publish your software with these new changes. Otherwise, fix any merge conflicts by clicking the Resolve Conflicts button.

Have fun!

Created by Backstroke (I'm a bot!)