mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-31 09:21:09 +02:00
Merge branch 'master' into dvbsi++
Conflicts:
src/zapit/include/zapit/zapit.h
Origin commit data
------------------
Commit: 86dbdde70d
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2012-04-12 (Thu, 12 Apr 2012)
This commit is contained in:
@@ -1604,7 +1604,7 @@
|
||||
<transponder frequency="11953000" symbol_rate="27500000" polarization="0" fec_inner="3" system="0" modulation="1"/>
|
||||
<transponder frequency="11973000" symbol_rate="27500000" polarization="1" fec_inner="3" system="0" modulation="1"/>
|
||||
<transponder frequency="11992000" symbol_rate="27500000" polarization="0" fec_inner="9" system="1" modulation="1"/>
|
||||
<transponder frequency="12012000" symbol_rate="27500000" polarization="1" fec_inner="2" system="1" modulation="2"/>
|
||||
<transponder frequency="12012000" symbol_rate="29700000" polarization="1" fec_inner="2" system="1" modulation="2"/>
|
||||
<transponder frequency="12031000" symbol_rate="27500000" polarization="0" fec_inner="3" system="0" modulation="1"/>
|
||||
<transponder frequency="12051000" symbol_rate="27500000" polarization="1" fec_inner="3" system="0" modulation="1"/>
|
||||
<transponder frequency="12070000" symbol_rate="27500000" polarization="0" fec_inner="3" system="0" modulation="1"/>
|
||||
|
Reference in New Issue
Block a user