• knopp's avatar
    Merge remote-tracking branch 'origin/develop' into bugfix-48-L1L2signaling · e71aebc6
    knopp authored
    Conflicts:
    	openair1/PHY/LTE_ESTIMATION/lte_eNB_measurements.c
    	openair1/PHY/LTE_TRANSPORT/dlsch_coding.c
    	openair1/SCHED/phy_procedures_lte_eNb.c
    	openair2/LAYER2/MAC/config.c
    	openair2/LAYER2/MAC/pre_processor.c
    	openair2/LAYER2/openair2_proc.c
    	openair2/RRC/LITE/rrc_eNB.c
    	openair3/NAS/UE/API/USIM/usim_api.c
    	openair3/NAS/UE/ESM/esm_ebr_context.c
    e71aebc6
phy_procedures_lte_ue.c 154 KB