Merge branch 'master' into pu/mp

Origin commit data
------------------
Commit: 05e8d727bd
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-05-28 (Sun, 28 May 2017)
This commit is contained in:
Jacek Jendrzej
2017-05-28 22:30:05 +02:00
16 changed files with 68 additions and 64 deletions

View File

@@ -534,7 +534,7 @@
<transponder frequency="594000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="602000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="610000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="618000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
<transponder frequency="618000" symbol_rate="6111000" fec_inner="0" modulation="3"/>
<transponder frequency="626000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="634000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="642000" symbol_rate="6900000" fec_inner="0" modulation="5"/>