Raymond Knopp f99754a5ea Merge remote-tracking branch 'origin/develop' into tdd25period_for_MR ...

Conflicts:
	openair1/PHY/NR_TRANSPORT/nr_dlsch.c
	openair1/PHY/NR_TRANSPORT/nr_sch_dmrs.c
	openair1/SIMULATION/NR_PHY/dlsim.c
	openair1/SIMULATION/NR_PHY/ulsim.c
	openair2/GNB_APP/gnb_config.c
	openair2/LAYER2/NR_MAC_gNB/config.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
	openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
	openair2/RRC/NR/MESSAGES/asn1_msg.c

2022-03-05 21:12:32 +01:00

..

L2_INTERFACE

Compile all targets to fix compilation regression

2021-09-14 09:37:06 +02:00

LITE

code cleanup, no feature

2021-10-24 14:47:24 +02:00

LTE

Merge branch 'eurecom-develop' into episys-ul-info-cleanup

2022-02-23 08:55:10 -08:00

NAS

fix(NAS): remove compilation warning

2021-09-03 13:07:56 +02:00

NR

Merge remote-tracking branch 'origin/develop' into tdd25period_for_MR

2022-03-05 21:12:32 +01:00

NR_UE

Merge remote-tracking branch 'origin/NR_SA_pdu_session_modify_release' into integration_2022_wk09

2022-03-03 18:05:27 +01:00