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.

srsLTE codebot 3daa9f3fc3 Merge branch 'next' into agpl_next ... # Conflicts: # lib/include/srslte/common/mac_nr_pcap.h # lib/include/srslte/phy/ue/ue_ul_nr_data.h # lib/src/common/mac_nr_pcap.cc # lib/src/phy/ue/ue_ul_nr_data.c # srsenb/hdr/phy/lte/worker_pool.h # srsenb/hdr/phy/nr/cc_worker.h # srsenb/hdr/phy/nr/sf_worker.h # srsenb/hdr/phy/nr/worker_pool.h # srsenb/src/phy/lte/worker_pool.cc # srsenb/src/phy/nr/cc_worker.cc # srsenb/src/phy/nr/sf_worker.cc # srsenb/src/phy/nr/worker_pool.cc # srsue/hdr/phy/lte/worker_pool.h # srsue/hdr/phy/nr/cc_worker.h # srsue/hdr/phy/nr/sf_worker.h # srsue/hdr/phy/nr/worker_pool.h # srsue/hdr/stack/mac/mac_nr.h # srsue/src/phy/lte/worker_pool.cc # srsue/src/phy/nr/cc_worker.cc # srsue/src/phy/nr/sf_worker.cc # srsue/src/phy/nr/worker_pool.cc # srsue/src/stack/mac/mac_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	Adding AGPL copyright to new files	4 years ago
drb.conf.example	Fix issue in getting PDCP discard timer from configs	4 years ago
enb.conf.example	Backport some changes from FAPI branch (#2124)	4 years ago
rr.conf.example	enable meas gaps in RRC and enb parser	4 years ago
sib.conf.example	srsenb: Add inline documentation for sib7 in example configs	4 years ago
sib.conf.mbsfn.example	updating sib13 config for mbms, fixing small bug with metrics	4 years ago