Merge commit 'develop' into feature-127-protocol-split

* remove a lot of white spaces * many conflicts in enb_config.c
2018-11-07 16:07:59 +01:00
parent c1e680dd89 09187015aa
commit 397d2f4815
246 changed files with 16448 additions and 9003 deletions
@@ -65,6 +65,8 @@ typedef enum {
    MSC_F1AP_CU,
    MSC_F1AP_DU,
    MAX_MSC_PROTOS,
+    MSC_X2AP_SRC_ENB,
+    MSC_X2AP_TARGET_ENB,
 } msc_proto_t;