Raymond Knopp 4d0d4fcb29 Merge remote-tracking branch 'origin/develop-SA-CBRA' into NR_SA_F1AP_5GRECORDS ...

Conflicts:
	cmake_targets/CMakeLists.txt
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_bch.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
	openair2/LAYER2/nr_pdcp/nr_pdcp_entity.c
	openair2/LAYER2/nr_pdcp/nr_pdcp_entity.h
	openair2/LAYER2/nr_pdcp/nr_pdcp_entity_drb_am.c
	openair2/LAYER2/nr_pdcp/nr_pdcp_sdu.h
	openair2/RRC/NR/rrc_gNB.c
	openair2/RRC/NR_UE/rrc_UE.c

2021-03-27 15:31:22 +01:00

..

COMMON

Merge remote-tracking branch 'remotes/oai/develop' into HEAD

2021-03-08 14:51:11 +09:00

gNB

add documentation and code review comments

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

NR_UE

add nrue nas task

2021-02-16 14:14:46 +09:00

TEST

Fixing errored/missing circular dependency protection

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

TOOLS

cleanup branch

2020-05-20 15:44:20 +02:00

UE

Merge remote-tracking branch 'remotes/oai/develop' into HEAD

2021-03-08 14:51:11 +09:00