Skip to content
Snippets Groups Projects
Commit 1cc09da8 authored by Xue Song's avatar Xue Song
Browse files

Merge branch 'develop_SA_L3' into develop_SA_F1 

Conflicts:
	openair2/GNB_APP/gnb_config.c
	openair2/RRC/NR/rrc_gNB.c
parents cb0d7c3d c6cd8f37
No related branches found
No related tags found
7 merge requests!1757Draft: Use pMAX value in configuration file, instead of hardcoded '23' in asn1_msg.c,!1493fix DL arq errors in UE,!1190WIP: [CI] Test SA 5GREC + CI updates (Test purpose only),!1183WIP: [CI] test NSA on 5GREC,!1173[CI] test rfsim sa,!1151develop-NR_SA_F1AP_5GRECORDS,!1047WIP: Updating 5GNR F1 interface working with simulator
Hide whitespace changes
Inline Side-by-side
Showing
with 498 additions and 33 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment