Skip to content
Snippets Groups Projects
Commit 614083f0 authored by Thomas Schlichter's avatar Thomas Schlichter :flag_de:
Browse files

Merge branch 'develop' into NR_RRC_PRACH_procedures 

Conflicts:
	cmake_targets/CMakeLists.txt
	openair2/GNB_APP/gnb_app.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
	openair2/RRC/NR/rrc_gNB_nsa.c
parents 96dc4a88 90b10268
No related branches found
No related tags found
8 merge requests!1757Draft: Use pMAX value in configuration file, instead of hardcoded '23' in asn1_msg.c,!1493fix DL arq errors in UE,!1093Issue in generating NR PRACH for High Speed case,!1074PBCH test case support for non-zero bchpyload,!847Nr vcd,!836Nr fix phytest packet corruption dlsch,!833Develop integration 2020 week 25,!799WIP: Nr rrc prach procedures
Hide whitespace changes
Inline Side-by-side
Showing
with 96 additions and 145 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