Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Create ua-Lviv #142

Open
wants to merge 1 commit into
base: tvheadend
Choose a base branch
from
Open

Create ua-Lviv #142

wants to merge 1 commit into from

Conversation

uAltair
Copy link

@uAltair uAltair commented Sep 29, 2023

Create ua-Lviv 2023-09-29

Create ua-Lviv 2023-09-29
ali1234 added a commit to ali1234/dtv-scan-tables that referenced this pull request Aug 8, 2024
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
@ali1234 ali1234 mentioned this pull request Aug 8, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant