You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
Codebot ccf8cfb65f Merge branch 'next' into agpl_next
# Conflicts:
#	lib/include/srsran/common/basic_pnf.h
#	lib/include/srsran/common/basic_vnf.h
#	lib/include/srsran/common/basic_vnf_api.h
#	lib/src/common/basic_vnf.cc
#	lib/test/common/pnf_bridge.cc
#	lib/test/common/pnf_dummy.cc
#	srsenb/hdr/phy/vnf_phy_nr.h
#	srsenb/hdr/stack/mac/nr/sched_nr_common.h
#	srsenb/hdr/stack/mac/nr/sched_nr_phy_helpers.h
#	srsenb/src/phy/vnf_phy_nr.cc
#	srsenb/src/stack/mac/nr/sched_nr_common.cc
#	srsenb/src/stack/mac/nr/sched_nr_phy_helpers.cc
#	srsue/hdr/phy/vnf_phy_nr.h
#	srsue/src/phy/vnf_phy_nr.cc
3 years ago
..
mac Merge branch 'next' into agpl_next 3 years ago
mac_common Merge branch 'next' into agpl_next 3 years ago
mac_nr Merge branch 'next' into agpl_next 4 years ago
rrc Merge branch 'next' into agpl_next 3 years ago
upper Merge branch 'next' into agpl_next 3 years ago
bearer_manager.h Adding AGPL copyright to new files 3 years ago
ue_stack_base.h Adding AGPL copyright to new files 4 years ago
ue_stack_lte.h Merge branch 'next' into agpl_next 3 years ago
ue_stack_nr.h Merge branch 'next' into agpl_next 3 years ago