Skip to content
Snippets Groups Projects
Commit f5239e09 authored by Haruki Naoi's avatar Haruki Naoi
Browse files

Merge remote-tracking branch 'remotes/origin/ues_test' into mu_with_tdd1 

# Conflicts:
#	common/utils/itti/intertask_interface.c
#	openair1/SCHED/fapi_l1.c
#	openair1/SCHED/phy_procedures_lte_eNb.c
parents ba8a111e 8f86f38d
No related branches found
No related tags found
2 merge requests!326Develop integration 2018 w25,!325Mu with tdd1
Hide whitespace changes
Inline Side-by-side
Showing
with 268 additions and 129 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