Skip to content
Snippets Groups Projects
Commit 84a1c737 authored by Raymond Knopp's avatar Raymond Knopp
Browse files

Merge remote-tracking branch 'origin/develop' into bugfix-48-L1L2signaling

Conflicts:
	openair1/PHY/LTE_TRANSPORT/print_stats.c
	openair1/SCHED/phy_procedures_lte_eNb.c
	openair1/SCHED/phy_procedures_lte_ue.c
	targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.rrh.usrpb210.conf
	targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.usrpb210.conf
parents 26f5d0d9 16b0ec39
No related branches found
No related tags found
No related merge requests found
Showing
with 1911 additions and 540 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment