Changeset 18201 for ipk/source.sh4/titansettings_default_sat_1_0/var/etc/titan/bouquets.hauptliste.tv

Timestamp:

10/12/12 17:06:36 (12 years ago)

Author:

obi

Message:

fix merge

File:

• ipk/source.sh4/titansettings_default_sat_1_0/var/etc/titan/bouquets.hauptliste.tv (modified) (8 diffs)

ipk/source.sh4/titansettings_default_sat_1_0/var/etc/titan/bouquets.hauptliste.tv

@@ -10 +10 @@
 61303#66553
 5402#66645
+11930#66565
 21107#66589
 21108#66589
@@ -20 +21 @@
 12061#66625
 12060#66625
+51#8716321
 776#8716293
 1793#8716293
 12040#66625
 11160#66546
+28680#66614
+63#8716321
 4914#66543
 21100#66589
+900#8716321
 31200#66627
 17503#66643
@@ -39 +44 @@
 28721#66587
 28723#66587
+12614#66649
 28108#66637
 28325#66737
@@ -49 +55 @@
 28206#66609
 28205#66609
+28676#66614
+28656#66602
 772#8716293
 28106#66637
@@ -68 +76 @@
 28225#66609
 764#8716293
+32#8716321
 17#8716291
 108#8716300
@@ -132 +141 @@
 56#8716303
 19#8716305
+28682#66614
 2047#3474505
 117#8716299
@@ -175 +185 @@
 59#8716303
 2044#3474505
+28673#66614
+28671#66614
+28654#66602
+28655#66602
+28659#66602
 5411#66645
 765#8716295
+12100#66644
 21103#66589
+3394#66644
 64#8716293
+40#8716321
 21104#66589
 31210#66627
+77#8716321
 12080#66625
 769#8716295
@@ -192 +211 @@
 13223#66539
 13106#66651
+20007#66618
 13101#66651
 13221#66539