• knopp's avatar
    Merge remote-tracking branch 'origin/develop' into develop-nr · b93b7073
    knopp authored
    Conflicts:
    	ci-scripts/Jenkinsfile-gitlab
    	ci-scripts/buildOnVM.sh
    	ci-scripts/checkCodingFormattingRules.sh
    	ci-scripts/createVM.sh
    	ci-scripts/destroyAllRunningVM.sh
    	ci-scripts/reportBuildLocally.sh
    	cmake_targets/CMakeLists.txt
    	cmake_targets/build_oai
    	cmake_targets/tools/build_helper
    	common/utils/LOG/log.h
    	openair1/PHY/LTE_ESTIMATION/lte_sync_timefreq.c
    	openair1/PHY/TOOLS/file_output.c
    	openair1/PHY/TOOLS/lte_dfts.c
    	openair1/PHY/TOOLS/tools_defs.h
    	openair1/PHY/defs_eNB.h
    	openair1/PHY/impl_defs_lte.h
    	openair1/SCHED_UE/phy_procedures_lte_ue.c
    	openair2/COMMON/platform_constants.h
    	openair2/COMMON/platform_types.h
    	openair2/LAYER2/MAC/eNB_scheduler.c
    	openair2/LAYER2/MAC/main.c
    	openair2/RRC/LTE/L2_interface.c
    	openair2/RRC/LTE/MESSAGES/asn1_msg.c
    	openair2/RRC/LTE/MESSAGES/asn1_msg_NB_IoT.c
    	openair2/RRC/LTE/rrc_UE.c
    	openair2/RRC/LTE/rrc_eNB.c
    	openair2/RRC/LTE/rrc_eNB_S1AP.c
    	openair2/UTIL/LOG/log.c
    	openair3/S1AP/s1ap_common.h
    	openair3/S1AP/s1ap_eNB.c
    	openair3/S1AP/s1ap_eNB_context_management_procedures.c
    	openair3/S1AP/s1ap_eNB_decoder.c
    	openair3/S1AP/s1ap_eNB_decoder.h
    	openair3/S1AP/s1ap_eNB_handlers.c
    	openair3/S1AP/s1ap_eNB_nas_procedures.c
    	openair3/S1AP/s1ap_eNB_overload.c
    	openair3/S1AP/s1ap_eNB_trace.c
    	openair3/TEST/EPC_TEST/play_scenario_decode.c
    	openair3/TEST/EPC_TEST/play_scenario_s1ap.c
    	openair3/TEST/EPC_TEST/play_scenario_s1ap_compare_ie.c
    	targets/COMMON/openairinterface5g_limits.h
    	targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.50PRB.usrpb210.conf
    	targets/RT/USER/lte-ran.c
    	targets/RT/USER/lte-ru.c
    	targets/RT/USER/lte-ue.c
    	targets/SIMU/USER/oaisim_functions.c
    b93b7073
if4_tools.c 307 KB