Raymond Knopp a446eb0ebc Merge branch 'episys/master' into episys-merge ...

Conflicts:
	common/utils/LOG/log.h
	common/utils/ocp_itti/intertask_interface.cpp
	nfapi/oai_integration/nfapi_vnf.c
	nfapi/open-nFAPI/nfapi/src/nfapi.c
	openair2/LAYER2/MAC/main_ue.c
	openair2/LAYER2/PDCP_v10.1.0/pdcp.c
	openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c
	openair2/PHY_INTERFACE/phy_stub_UE.c
	openair2/RRC/LTE/rrc_UE.c
	openair2/RRC/LTE/rrc_eNB.c
	openair3/NAS/UE/ESM/esm_ebr_context.c
	targets/COMMON/openairinterface5g_limits.h
	targets/RT/USER/lte-softmodem.c
	targets/RT/USER/lte-uesoftmodem.c

2021-02-13 22:52:33 +01:00

..

config

CPPCHECK: fixes

2020-06-19 11:41:03 +02:00

utils

Merge branch 'episys/master' into episys-merge

2021-02-13 22:52:33 +01:00

ngran_types.h

COMMON types updated: VCD,FAPI

2019-09-14 12:55:32 +02:00

ran_context.h

Add rrc_gNB_process_NGAP_PDUSESSION_SETUP_REQ

2020-11-17 19:03:55 +09:00