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
..
adt Merge branch 'next' into agpl_next 3 years ago
asn1 Merge branch 'next' into agpl_next 3 years ago
common Merge branch 'next' into agpl_next 3 years ago
interfaces Merge branch 'next' into agpl_next 3 years ago
mac Merge branch 'next' into agpl_next 3 years ago
phy Merge branch 'next' into agpl_next 3 years ago
radio Merge branch 'next' into agpl_next 3 years ago
rlc Merge branch 'next' into agpl_next 3 years ago
rrc Merge branch 'next' into agpl_next 3 years ago
srslog Merge branch 'next' into agpl_next 3 years ago
support Adding AGPL copyright to new files 3 years ago
system Merge branch 'next' into agpl_next 4 years ago
test Merge branch 'next' into agpl_next 4 years ago
upper Merge branch 'next' into agpl_next 3 years ago
CMakeLists.txt Adding AGPL copyright to new files 4 years ago
build_info.h.in Adding AGPL copyright to new files 4 years ago
config.h Adding AGPL copyright to new files 4 years ago
srsran.h Merge branch 'next' into agpl_next 4 years ago
version.h.in Adding AGPL copyright to new files 4 years ago