Skip to content
Snippets Groups Projects
Commit 81f578f0 authored by Cédric Roux's avatar Cédric Roux
Browse files

Merge remote-tracking branch 'origin/develop' into feature-15-carrier_aggregation 

lte-softmodem compiles, not tested if things work...

Conflicts:
	cmake_targets/CMakeLists.txt
	openair1/PHY/LTE_TRANSPORT/pucch.c
	openair1/SCHED/phy_procedures_lte_eNb.c
	openair2/LAYER2/MAC/eNB_scheduler_RA.c
	openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
	openair2/LAYER2/MAC/eNB_scheduler_primitives.c
	openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
	openair2/LAYER2/MAC/main.c
	openair2/PHY_INTERFACE/defs.h
	openair2/RRC/LITE/rrc_eNB.c
	targets/RT/USER/lte-softmodem.c
parents d13d035f 349f77ab
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 419 additions and 1591 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment