Skip to content
Snippets Groups Projects
Commit 51d93911 authored by knopp's avatar knopp
Browse files

Merge branch 'NR_SA_F1AP_5GRECORDS' of... 

Merge branch 'NR_SA_F1AP_5GRECORDS' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_SA_F1AP_5GRECORDS

Conflicts:
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
parents cf1b1257 5c33daa8
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 191 additions and 67 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