Merge tag 'upstream/0+git20161227.ac7535a'

Upstream version 0+git20161227.ac7535a

1 files changed, 0 insertions, 410 deletions

diff --git a/atsc/us-NTSC-center-frequencies-8VSB b/atsc/us-NTSC-center-frequencies-8VSB
deleted file mode 100644
index 8f153af..0000000
--- a/atsc/us-NTSC-center-frequencies-8VSB
+++ /dev/null
@@ -1,410 +0,0 @@
-# US NTSC center frequencies, use if in doubt
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 57000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 63000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 69000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 79000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 85000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 177000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 183000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 189000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 195000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 201000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 207000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 213000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 473000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 479000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 485000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 491000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 497000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 503000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 509000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 515000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 521000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 527000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 533000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 539000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 545000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 551000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 557000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 563000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 569000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 575000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 581000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 587000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 593000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 599000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 605000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 611000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 617000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 623000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 629000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 635000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 641000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 647000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 653000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 659000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 665000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 671000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 677000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 683000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 689000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 695000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 701000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 707000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 713000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 719000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 725000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 731000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 737000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 743000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 749000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 755000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 761000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 767000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 773000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 779000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 785000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 791000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 797000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 803000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-