Raymond Knopp 6fb731ea5d Merge remote-tracking branch 'origin/NR_2port_CSIRS' into CSI-SA ...

Conflicts:
	ci-scripts/xml_files/fr1_sa_quectel.xml
	executables/nr-gnb.c
	openair1/SCHED_NR/phy_procedures_nr_gNB.c
	openair1/SIMULATION/NR_PHY/dlsim.c
	openair2/GNB_APP/gnb_paramdef.h
	openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.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_uci.c
	openair2/LAYER2/NR_MAC_gNB/mac_proto.h
	openair2/LAYER2/NR_MAC_gNB/main.c
	openair2/RRC/NR/MESSAGES/asn1_msg.c

2021-12-01 14:51:10 +01:00

..

L2_INTERFACE

Merge branch 'develop' into feature-127-protocol-split

2019-02-21 20:18:35 +01:00

LITE

code cleanup, no feature

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

LTE

Merge remote-tracking branch 'origin/develop-aw2sori' into integration_2021_wk47_b

2021-11-24 09:42:56 +01:00

NAS

fix(NAS): remove compilation warning

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

NR

Merge remote-tracking branch 'origin/NR_2port_CSIRS' into CSI-SA

2021-12-01 14:51:10 +01:00

NR_UE

Merge remote-tracking branch 'origin/code-cleanup-2021oct24' into integration_2021_wk45_b

2021-11-08 13:12:52 +01:00