Skip to content
Snippets Groups Projects
Commit 09efbc02 authored by knopp's avatar knopp
Browse files

Merge remote-tracking branch 'origin/develop' into nr_pucch2_polar

Conflicts:
	openair1/PHY/NR_TRANSPORT/pucch_rx.c
parents 417bc7e5 90b10268
No related branches found
No related tags found
No related merge requests found
Showing
with 426 additions and 133 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