Merge branch 'develop' into feature-59-tm4

Conflicts: openair1/PHY/TOOLS/lte_phy_scope.c
2016-03-21 15:31:19 +01:00
parent 6eea200c35 28dae90984
commit 978a7a627e
40 changed files with 12580 additions and 623 deletions
@@ -777,6 +777,7 @@ void phy_scope_UE(FD_lte_phy_scope_ue *form,
        fl_set_xyplot_data(form->pdsch_llr,bit,llr,coded_bits_per_codeword0,"","","");
    }

+
  // PDSCH I/Q of MF Output
    if (pdsch_comp!=NULL) {
        ind=0;