Skip to content

O
OpenXG-RAN
Switch branch/tag
Find file BlameHistoryPermalink
  • luis_pereira87's avatar
    Merge remote-tracking branch 'origin/develop' into Dedicated-BWPs · a8e6bf9b
    luis_pereira87 authored 
    # Conflicts:
#	openair2/GNB_APP/gnb_config.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
#	openair2/RRC/NR/L2_nr_interface.c
#	openair2/RRC/NR/MESSAGES/asn1_msg.c
#	openair2/RRC/NR/MESSAGES/asn1_msg.h
#	openair2/RRC/NR/nr_rrc_defs.h
#	openair2/RRC/NR/nr_rrc_proto.h
#	openair2/RRC/NR/rrc_gNB_reconfig.c
    a8e6bf9b
nr_rrc_defs.h 22.1 KB