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.
ismagom 7cfe77e565 Merge branch 'new_arch'
Conflicts:
	srsapps/common/include/srsapps/common/log.h
	srsapps/common/include/srsapps/common/log_stdout.h
	srsapps/common/include/srsapps/common/threads.h
	srsapps/common/src/log_stdout.cc
	srsapps/common/src/threads.c
	srsapps/ue/mac/src/demux.cc
	srsapps/ue/mac/src/dl_harq.cc
	srsapps/ue/mac/src/mac.cc
	srsapps/ue/mac/src/mux.cc
	srsapps/ue/mac/src/proc_bsr.cc
	srsapps/ue/mac/src/proc_ra.cc
	srsapps/ue/mac/src/proc_sr.cc
	srsapps/ue/mac/src/ul_harq.cc
	srsapps/ue/mac/test/mac_test.cc
	srsapps/ue/phy/src/dl_buffer.cc
	srsapps/ue/phy/src/phy.cc
	srsapps/ue/phy/src/prach.cc
	srsapps/ue/phy/src/ul_buffer.cc
9 years ago
..
examples Merge branch 'pdsch_pusch_bytes' into new_arch 9 years ago
include/srslte Added CQI support. Restored ue_ul normalization 9 years ago
lib Merge branch 'new_arch' 9 years ago
CMakeLists.txt Changed license to AGPL 10 years ago