Merge branch 'develop' into enhancement-10-harmony
Conflicts: openair1/SCHED/phy_mac_stub.c openair1/SCHED/phy_procedures_lte_eNb.c targets/RT/USER/lte-softmodem.c
This diff is collapsed.
Conflicts: openair1/SCHED/phy_mac_stub.c openair1/SCHED/phy_procedures_lte_eNb.c targets/RT/USER/lte-softmodem.c