Skip to content
Snippets Groups Projects
Commit 35236c81 authored by knopp's avatar knopp
Browse files

Merge branch 'NR_SA_F1AP_5GRECORDS' into gnb-n300-fixes 

Conflicts:
	executables/nr-ru.c
	openair1/SCHED_NR/phy_procedures_nr_gNB.c
	openair2/LAYER2/nr_rlc/nr_rlc_oai_api.c
parents 518edc74 85aab6e8
No related branches found
No related tags found
4 merge requests!1757Draft: Use pMAX value in configuration file, instead of hardcoded '23' in asn1_msg.c,!1493fix DL arq errors in UE,!1249Update episys-merge from develop,!1193Update for 5G SA implementation
Hide whitespace changes
Inline Side-by-side
Showing
with 1939 additions and 342 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