Merge remote-tracking branch 'origin/develop' into NR_RRC_processing_timer
# Conflicts: # openair2/LAYER2/NR_MAC_gNB/config.c # openair2/LAYER2/NR_MAC_gNB/mac_proto.h
Showing
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Please register or sign in to comment