merge develop but not complete [unstable]

2018-08-06 01:46:19 -07:00
parent 9b7143ca86
commit 3e354e2ece
6 changed files with 4711 additions and 1189 deletions
@@ -64,8 +64,9 @@
 //#include "AS-Context.h"
 #include "NR_UE-NR-Capability.h"
 #include "NR_MeasResults.h"
+#include "NR_MeasResults.h"
+#include "NR_CellGroupConfig.h"
 #include "NR_ServingCellConfigCommon.h"
-
 //-------------------

 #if defined(ENABLE_ITTI)