Skip to content
Snippets Groups Projects
Commit a3329b56 authored by Haruki NAOI's avatar Haruki NAOI
Browse files

Merge commit '8471bd14' into mu_with_tdd1 

# Conflicts:
#	common/utils/itti/intertask_interface.c
#	openair1/SCHED/phy_procedures_lte_eNb.c
parents f5239e09 8471bd14
Hide whitespace changes
Inline Side-by-side
Showing
with 130 additions and 149 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