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 3a9014802d Merge branch 'next' into agpl_next
# Conflicts:
#	srsenb/hdr/stack/rrc/nr/rrc_config_nr.h
#	srsenb/hdr/stack/rrc/rrc_nr.h
#	srsenb/src/stack/mac/nr/sched_nr_signalling.cc
#	srsenb/test/rrc/rrc_nr_test.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 enb: make the pcap default boost arguments consistent with enb.conf 3 years ago
rb.conf.example Corrected default rb.conf 3 years ago
rr.conf.example lte,enb,rrc: parse cellIndividualOffset in rr.conf and propagate it to measConfig sent to UE 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