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

..

pdcp_control_primitive.c

patch develop-get-freememblock.patch into closed_item

2018-04-12 20:02:36 +09:00

pdcp_control_primitives_proto_extern.h

upgrade license to version 1.1

2017-10-23 12:22:13 +02:00

pdcp_fifo.c

Merge branch 'episys/master' into episys-merge

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

pdcp_netlink.c

modifications

2019-12-05 04:53:56 +01:00

pdcp_primitives.c

log.c simplification, fix usefull functionality which never worked, move all log code from openair2 to common

2018-07-30 20:07:22 +02:00

pdcp_primitives.h

bugfix: fix PDCP sequence management (plus some cleanup)

2019-02-27 12:33:04 +01:00

pdcp_security.c

ENABLE_ITTI macro removal, modified telnet server to support all executables, modified record player to finalize switch to run-time option and allow usage with any device

2020-02-12 19:05:44 +01:00

pdcp_sequence_manager.c

bugfix: fix PDCP sequence management (plus some cleanup)

2019-02-27 12:33:04 +01:00

pdcp_sequence_manager.h

bugfix: fix PDCP sequence management (plus some cleanup)

2019-02-27 12:33:04 +01:00

pdcp_thread.c

still to compile

2019-04-30 14:25:42 +02:00

pdcp_util.c

log.c simplification, fix usefull functionality which never worked, move all log code from openair2 to common

2018-07-30 20:07:22 +02:00

pdcp_util.h

log.c simplification, fix usefull functionality which never worked, move all log code from openair2 to common

2018-07-30 20:07:22 +02:00

pdcp.c

Merge branch 'episys/master' into episys-merge

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

pdcp.h

Merge branch 'episys/master' into episys-merge

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