Skip to content
Snippets Groups Projects
Commit a5f9c925 authored by Elena Lukashova's avatar Elena Lukashova
Browse files

Merge remote-tracking branch 'origin/hotfix-71-freq_channel' into feature-59-tm4 

Conflicts:
	openair1/PHY/TOOLS/cdot_prod.c
	targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.usrpb210.conf
parents d0fac35f 60115531
No related branches found
No related tags found
3 merge requests!116Develop integration w07,!112Tm4 fixes,!106Feature 59 tm4
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 2309 additions and 277 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