Skip to content
Snippets Groups Projects
Commit 03351303 authored by Xiwen JIANG's avatar Xiwen JIANG
Browse files

Merge branch 'feature-21-TM7' of... 

Merge branch 'feature-21-TM7' of https://gitlab.eurecom.fr/oai/openairinterface5g into feature-21-TM7

Conflicts:
	cmake_targets/CMakeLists.txt
	openair2/ENB_APP/enb_config.c
parents fbfb756c 12f1cb9c
No related branches found
No related tags found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 1672 additions and 1325 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