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
4 years ago
..
hdr Merge branch 'next' into agpl_next 4 years ago
src Merge branch 'next' into agpl_next 4 years ago
test Merge branch 'next' into agpl_next 4 years ago
CMakeLists.txt Merge branch 'next' into agpl_next 4 years ago
enb.conf.example feature - make minimum SNR, under which the RRC is notified with UL KO, configurable 4 years ago
rb.conf.example enb,configuration: allow to specify enb specific max nof RLC retxs 4 years ago
rr.conf.example Add option to rr.conf to select sub-band CQI K value (#3071) 4 years ago
sib.conf.example change default sib and rr conf PUCCH-specific default values to decrease the size of PUCCH 4 years ago
sib.conf.mbsfn.example updating sib13 config for mbms, fixing small bug with metrics 4 years ago