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

..

COMMON

add license text

2021-02-01 13:59:56 +09:00

gNB

add documentation and code review comments

2020-10-29 16:14:55 +01:00

NR_UE

Fix merge conflict

2020-12-21 12:25:36 +09:00

TEST

Fixing errored/missing circular dependency protection

2020-05-15 15:39:11 +02:00

TOOLS

Cleanup before merge

2021-01-08 14:31:13 -08:00

UE

Merge branch 'episys/master' into episys-merge

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