Merge remote-tracking branch 'origin/fix-compile' into develop-NR_SA_F1AP_5GRECORDS

# Conflicts:
#	cmake_targets/CMakeLists.txt
#	openair2/RRC/NR_UE/rrc_UE.c
#	openair2/SIMULATION/NR_RRC/itti_sim.c
This commit is contained in:
rmagueta
2021-05-19 12:09:27 +01:00
23 changed files with 151 additions and 220 deletions
+1
View File
@@ -28,6 +28,7 @@
#include "PHY/defs_eNB.h"
#include "PHY/defs_UE.h"
#include "PHY/impl_defs_top.h"
#include <common/ran_context.h>
/* Forms and Objects */