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

..

main-fs6.c

merge develop, improve doc

2020-10-21 14:38:17 +02:00

main-ocp.c

Merge branch 'episys/master' into episys-merge

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

nr-gnb.c

Enabling a log for CI purpose

2021-02-01 13:41:53 +01:00

nr-ru.c

Merge remote-tracking branch 'origin/benetel_phase_rotation' into integration_2020_wk46_2

2020-11-13 13:21:42 +01:00

nr-softmodem-common.h

Cleanup UE mac_enabled conditions

2020-12-27 19:28:13 +01:00

nr-softmodem.c

Merge remote-tracking branch 'origin/itti-enhancement' into integration_2021_wk04_b

2021-01-29 07:40:07 +01:00

nr-softmodem.h

nr scope as a dynamically loaded shared lib

2020-07-17 15:59:38 +02:00

nr-ue.c

Merge branch 'develop' into ue-fixes

2021-02-08 15:06:17 +01:00

nr-uesoftmodem.c

Merge remote-tracking branch 'develop' into NR_RA_cleanup

2021-01-29 18:52:37 +01:00

nr-uesoftmodem.h

make sure MAC is enabled in nr-uesoftmodem

2021-01-22 12:06:41 +01:00

ocp-gnb.c

fix after code review

2021-01-21 13:47:18 +01:00

softmodem-common.c

Episys/andrew/dlsch pdu index bug fix

2020-11-13 14:11:35 -08:00

softmodem-common.h

Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop-sib1

2020-12-18 13:43:48 +00:00

split_headers.h

Merge remote-tracking branch 'origin/fembms-enb-ue' into develop_integration_2020_w34

2020-08-21 16:13:08 +02:00

stats.h

CI: optmimizations on VM-based framework

2020-09-15 12:18:26 +02:00

thread-common.h

Updated the config files

2020-11-25 11:12:32 +01:00

threads_t.h

CI: optmimizations on VM-based framework

2020-09-15 12:18:26 +02:00

transport_split.c

update license text

2020-04-29 11:31:00 +02:00

uecap.raw

modification in uecap.raw

2019-10-13 11:00:49 +02:00