Skip to content
Snippets Groups Projects
Commit 343f338d authored by Xenofon Foukas's avatar Xenofon Foukas
Browse files

Merge remote-tracking branch 'oai/develop' into oai-integration

Conflicts:
	cmake_targets/CMakeLists.txt
	maketags
	openair2/RRC/LITE/rrc_eNB.c
parents 849639f3 85e562d0
No related branches found
No related tags found
No related merge requests found
Showing
with 1255 additions and 433 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