From f14ff00a57d531ddda78c794acc106b696e61711 Mon Sep 17 00:00:00 2001 From: Christoph Pfister Date: Sat, 25 Dec 2010 16:38:08 +0100 Subject: [PATCH] merge fi-3ktv and fi-Oulu into fi-dna suggested by Antti Palosaari --- dvb-c/fi-Oulu | 19 ------------------- dvb-c/{fi-3ktv => fi-dna} | 7 ++++++- 2 files changed, 6 insertions(+), 20 deletions(-) delete mode 100644 dvb-c/fi-Oulu rename dvb-c/{fi-3ktv => fi-dna} (75%) diff --git a/dvb-c/fi-Oulu b/dvb-c/fi-Oulu deleted file mode 100644 index 4b73f4a9..00000000 --- a/dvb-c/fi-Oulu +++ /dev/null @@ -1,19 +0,0 @@ -# DVB-C Channels in Oulu (Finland) -# dna network -# freq sr fec mod -C 330000000 6875000 NONE QAM128 #mux1 -C 370000000 6875000 NONE QAM128 #mux2 -C 362000000 6875000 NONE QAM128 #mux3 -C 354000000 6875000 NONE QAM128 #mux4 -C 346000000 6875000 NONE QAM128 #mux5 -C 338000000 6875000 NONE QAM128 #mux6 -C 322000000 6875000 NONE QAM128 #mux7 -C 314000000 6875000 NONE QAM128 #mux8 -C 378000000 6875000 NONE QAM128 #mux9 -C 306000000 6875000 NONE QAM128 #mux10 -C 298000000 6875000 NONE QAM128 #mux11 -C 290000000 6875000 NONE QAM128 #mux12 -C 274000000 6875000 NONE QAM128 #mux13 -C 266000000 6875000 NONE QAM128 #mux14 -C 258000000 6875000 NONE QAM128 #mux15 -C 250000000 6875000 NONE QAM128 #mux16 diff --git a/dvb-c/fi-3ktv b/dvb-c/fi-dna similarity index 75% rename from dvb-c/fi-3ktv rename to dvb-c/fi-dna index 1ec2278c..2339fc7e 100644 --- a/dvb-c/fi-3ktv +++ b/dvb-c/fi-dna @@ -1,9 +1,14 @@ -# 3KTV network reference channels +# DNA network reference channels # freq sr fec mod C 154000000 6875000 NONE QAM128 C 162000000 6875000 NONE QAM128 C 170000000 6875000 NONE QAM128 C 232000000 6875000 NONE QAM128 +C 250000000 6875000 NONE QAM128 +C 258000000 6875000 NONE QAM128 +C 266000000 6875000 NONE QAM128 +C 274000000 6875000 NONE QAM128 +C 290000000 6875000 NONE QAM128 C 298000000 6875000 NONE QAM128 C 306000000 6875000 NONE QAM128 C 314000000 6875000 NONE QAM128