Raymond Knopp 1e60fbd49f Merge branch 'NR_SA_F1AP_5GRECORDS' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_SA_F1AP_5GRECORDS ...

Conflicts:
	openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c

2021-04-12 10:21:25 +02: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 branch 'NR_SA_F1AP_5GRECORDS' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_SA_F1AP_5GRECORDS

2021-04-12 10:21:25 +02:00

nr_mac_common.h

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

2021-04-06 16:38:37 +02:00

nr_mac_extern.h

Rework default PDSCH time domain resource allocation tables

2021-03-31 14:31:19 +01:00

nr_mac.h

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

2021-04-01 11:19:28 +01:00