Skip to content
Snippets Groups Projects
Commit 7c9372d7 authored by knopp's avatar knopp
Browse files

Merge branch 'NR_RRC_PRACH_procedures' of...

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

Conflicts:
	openair1/PHY/NR_TRANSPORT/nr_transport_proto.h
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
parents e8834e96 f8523b6c
No related branches found
No related tags found
No related merge requests found
Showing
with 1276 additions and 1003 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment