Skip to content
Snippets Groups Projects
Commit d32cdd1f authored by Raymond Knopp's avatar Raymond Knopp
Browse files

Merge remote-tracking branch 'origin/develop' into develop-nos1-fixes 

Conflicts:
	openair1/SCHED/fapi_l1.c
	openair1/SCHED/phy_procedures_lte_eNb.c
	openair2/LAYER2/MAC/config.c
parents 39d33dc4 8489e406
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 29159 additions and 282 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