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 585e3c51c1 Merge branch 'next' into agpl_next
# Conflicts:
#	srsenb/hdr/phy/nr/cc_worker.h
#	srsenb/hdr/phy/nr/sf_worker.h
#	srsenb/src/phy/nr/cc_worker.cc
#	srsenb/src/phy/nr/sf_worker.cc
#	test/phy/nr_phy_test.cc
4 years ago
..
hdr Merge branch 'next' into agpl_next 4 years ago
src Merge branch 'next' into agpl_next 4 years ago
CMakeLists.txt Adding AGPL copyright to new files 4 years ago
epc.conf.example Update security algorithms in epc.conf 4 years ago
mbms.conf.example replace FIXME with TODO 5 years ago
srsepc_if_masq.sh Adding AGPL copyright to new files 4 years ago
user_db.csv.example Fix order of discription in user_db.csv.example. 4 years ago