Commit b4a48e19 authored by Cedric Roux's avatar Cedric Roux
Browse files

Merge remote-tracking branch 'origin/update-license' into RU-RAU-split

Conflicts:
	openair1/PHY/CODING/rate_matching.c
	openair1/PHY/LTE_REFSIG/primary_synch.h
	openair2/LAYER2/layer2_top.c
	openair2/RRC/LITE/rrc_config.c
parents 5502026a 1b1f941e
Markdown is supported
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