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

..

nr_compute_tbs_common.c

Merge remote-tracking branch 'origin/develop-SA-CBRA-CUDU' into NR_SA_F1AP_5GRECORDS

2021-03-18 07:50:08 +01:00

nr_mac_common.c

Merge remote-tracking branch 'origin/develop' into develop-SA-CBRA

2021-03-19 15:07:08 +00:00

nr_mac_common.h

Merge remote-tracking branch 'origin/develop' into develop-SA-CBRA

2021-03-19 15:07:08 +00:00

nr_mac_extern.h

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

2020-12-10 16:24:28 +00:00

nr_mac.h

adding UL LCID 52 for CCCH with 48 bits

2021-03-24 16:09:48 +01:00