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 8c3332f894 Merge branch 'next' into agpl_next
# Conflicts:
#	srsenb/hdr/stack/upper/pdcp_nr.h
#	srsenb/hdr/stack/upper/rlc_nr.h
#	srsenb/src/stack/upper/pdcp_nr.cc
#	srsenb/src/stack/upper/rlc_nr.cc
3 years ago
..
hdr Merge branch 'next' into agpl_next 3 years ago
src Merge branch 'next' into agpl_next 3 years ago
test Merge branch 'next' into agpl_next 3 years ago
CMakeLists.txt Merge branch 'next' into agpl_next 3 years ago
enb.conf.example sched,lte: separated adaptive mcs learning rate argument into two arguments, one for DL and the other for UL 3 years ago
rb.conf.example Corrected default rb.conf 3 years ago
rr.conf.example combine all report configuration with all measurement objects 3 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