Skip to content
Snippets Groups Projects
Commit 938e0242 authored by Konstantinos Alexandris's avatar Konstantinos Alexandris
Browse files

Merge remote-tracking branch 'origin/develop' into x2 

Conflicts:
	cmake_targets/CMakeLists.txt
	openair2/ENB_APP/enb_app.c
	openair2/X2AP/x2ap_common.h
parents 2b85c4a3 c8eb68d5
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 2467 additions and 127 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