Ignore:
Timestamp:
Oct 12, 2012, 5:06:36 PM (14 years ago)
Author:
obi
Message:

fix merge

File:
1 edited

Legend:

Unmodified
Added
Removed

  • ipk/source.sh4/titansettings_default_sat_1_0/var/etc/titan/bouquets.xxx.tv

    r18200 r18201  
    1121#8716305
    222042#3474505
     34689#20851548
     413900#20848548
     54761#20853848
     64762#20853848
     716933#20856248
     816932#20856248
     913760#20845448
     1016931#20856248
     1113761#20845448
     1210#20845448
     1313768#20845448
     1413762#20845448
     1513764#20845448
     1613763#20845448
     1713766#20845448
     1813767#20845448
     1917029#66630
     2017059#66630
Note: See TracChangeset for help on using the changeset viewer.