Skip to content
Snippets Groups Projects

integration_2022_wk19b

Merged integration_2022_wk19b
integration_2022_wk19b into develop
All threads resolved!
Merged Robert Schmidt requested to merge integration_2022_wk19b into develop
All threads resolved!
Viewing commit a8e6bf9b
Prev Next
Show latest version
Compare changes
  • Side-by-side
  • Inline
Files
80
  • a8e6bf9b 
    # 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