Skip to content
Snippets Groups Projects
Commit a59cabd1 authored by gauthier's avatar gauthier
Browse files

Merge branch 'develop' into bugfix-48-L1L2signaling 

Conflicts:
	openair1/SCHED/phy_procedures_lte_eNb.c
	targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.usrpb210.conf
parents b0a54d8c ec399cd1
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 359 additions and 171 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