Skip to content
Snippets Groups Projects
Forked from oai / openairinterface5G
Source project has a limited visibility.
  • knopp's avatar
    914e17b5
    Merge remote-tracking branch 'origin/develop' into NR_RRCConfiguration · 914e17b5
    knopp authored
    Conflicts:
    	executables/nr-softmodem.c
    	executables/nr-ue.c
    	executables/softmodem-common.c
    	openair1/PHY/NR_TRANSPORT/nr_ulsch_decoding.c
    	openair1/SCHED_NR/phy_procedures_nr_gNB.c
    	openair1/SIMULATION/NR_PHY/dlsim.c
    	openair1/SIMULATION/NR_PHY/ulsim.c
    	openair2/LAYER2/NR_MAC_UE/mac_proto.h
    	openair2/NR_PHY_INTERFACE/NR_IF_Module.c
    	openair2/RRC/NR/MESSAGES/asn1_msg.c
    	openair2/RRC/NR/MESSAGES/asn1_msg.h
    	openair2/RRC/NR/nr_rrc_config.c
    	openair2/RRC/NR/nr_rrc_defs.h
    	openair2/RRC/NR/nr_rrc_proto.h
    	openair2/RRC/NR/rrc_gNB.c
    914e17b5
    History
    Merge remote-tracking branch 'origin/develop' into NR_RRCConfiguration
    knopp authored
    Conflicts:
    	executables/nr-softmodem.c
    	executables/nr-ue.c
    	executables/softmodem-common.c
    	openair1/PHY/NR_TRANSPORT/nr_ulsch_decoding.c
    	openair1/SCHED_NR/phy_procedures_nr_gNB.c
    	openair1/SIMULATION/NR_PHY/dlsim.c
    	openair1/SIMULATION/NR_PHY/ulsim.c
    	openair2/LAYER2/NR_MAC_UE/mac_proto.h
    	openair2/NR_PHY_INTERFACE/NR_IF_Module.c
    	openair2/RRC/NR/MESSAGES/asn1_msg.c
    	openair2/RRC/NR/MESSAGES/asn1_msg.h
    	openair2/RRC/NR/nr_rrc_config.c
    	openair2/RRC/NR/nr_rrc_defs.h
    	openair2/RRC/NR/nr_rrc_proto.h
    	openair2/RRC/NR/rrc_gNB.c