Skip to content
Snippets Groups Projects
Commit 35893b74 authored by Florian Kaltenberger's avatar Florian Kaltenberger
Browse files

Merge remote-tracking branch 'origin/develop' into enhancement-16-tm_rrc_reconfig

Conflicts:
	openair2/RRC/LITE/rrc_eNB.c
	targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.usrpb210.conf
parents f021d91e ac1c41f0
No related branches found
No related tags found
No related merge requests found
Showing
with 844 additions and 330 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