• Raymond Knopp's avatar
    Merge remote-tracking branch 'origin/develop' into enhancement-ltem · 44a225c6
    Raymond Knopp authored
    Conflicts:
    	openair1/PHY/LTE_TRANSPORT/dci_tools.c
    	openair1/SCHED/fapi_l1.c
    	openair1/SCHED/phy_procedures_lte_eNb.c
    	openair2/COMMON/rrc_messages_types.h
    	openair2/ENB_APP/enb_config.c
    	openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
    	openair2/LAYER2/MAC/eNB_scheduler_fairRR.c
    	openair2/LAYER2/MAC/eNB_scheduler_primitives.c
    	openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
    	openair2/LAYER2/MAC/mac.h
    	openair2/RRC/LTE/L2_interface.c
    	openair2/RRC/LTE/MESSAGES/asn1_msg.c
    	openair2/RRC/LTE/MESSAGES/asn1_msg.h
    	openair2/RRC/LTE/rrc_eNB.c
    	openair2/RRC/LTE/rrc_eNB_S1AP.c
    	targets/RT/USER/lte-enb.c
    44a225c6
lte_ul_channel_estimation.c 29.7 KB