rmagueta 97962f4635 Merge remote-tracking branch 'origin/develop' into develop-SRS ...

# Conflicts:
#	common/utils/nr/nr_common.h
#	openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_demodulation.c
#	openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
#	openair2/GNB_APP/gnb_paramdef.h
#	openair2/RRC/NR/rrc_gNB.c
#	openair2/RRC/NR/rrc_gNB_nsa.c

2021-12-24 11:53:25 +00: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/develop' into develop-SRS

2021-12-24 11:53:25 +00:00

NR_UE

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

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