Merge remote-tracking branch 'origin/develop-SA-CBRA' into NR_SA_F1AP_5GRECORDS

Browse Source

Conflicts:
	cmake_targets/build_oai
	openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c

...

This commit is contained in:

Raymond Knopp

2021-04-12 16:03:09 +02:00

parent 743c19e560 cd14ba9667

commit 1236f4c389

34 changed files with 1246 additions and 799 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp

+432 -412

File diff suppressed because it is too large Load Diff