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

Merge branch 'bugfix-176' into develop_integration_wk01 

There were some conflicts, manually resolved.

Conflicts:
	openair1/PHY/LTE_TRANSPORT/dci_tools.c
	openair1/SCHED/phy_procedures_lte_ue.c
parents de665ee4 2e7c28a5
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 516 additions and 196 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