Skip to content
Snippets Groups Projects
Commit 5e4f0a92 authored by Masayuki HARADA's avatar Masayuki HARADA
Browse files

Merge branch 'ues_test' into sp3_tdd_config1 

# Conflicts:
#	openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
parents 901c0da0 f8f149fd
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
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