Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merges the changes from upstream repository at: https://git.linuxtv.org/dtv-scan-tables In case of conflicts, the most recent changed file was used. In all but two cases, this means using the version from upstream. Conflicts: dvb-s/Astra-19.2E - replaced by Astra-1{KR,L,M,N}-19.2E dvb-s/Astra-28.2E - replaced by Astra-2{E,F,G}-28.2E dvb-s/PalapaC2_C-113.0E - Satellite was decommissioned dvb-s/Turksat-42.0E - Replaced by Trksat-{3,4}A-42.0E dvb-t/de-All dvb-t/ru-Perm - TVHeadend version used dvb-t/es-Huelva dvb-t/ru-Perm dvb-t/uk-Bilsdale dvb-t/uk-BluebellHill dvb-t/uk-Heathfield dvb-t/uk-Mendip dvb-t/uk-Oxford dvb-t/uk-Rowridge dvb-t/uk-SandyHeath dvb-t/uk-Sudbury dvb-t/uk-TunbridgeWells - Upstream version used 125 files modified only in TVHeadend. 3113 files modified only in upstream. Fixes tvheadend#139 Fixes tvheadend#132 Fixes tvheadend#118 Fixes tvheadend#109 Fixes tvheadend#82 Fixes tvheadend#78 Also obsoletes the following PRs - changes were already applied upstream: Closes tvheadend#150 Closes tvheadend#149 Closes tvheadend#148 Closes tvheadend#143 Closes tvheadend#142
- Loading branch information