Merge branch 'enhancement-10-harmony' of https://gitlab.eurecom.fr/oai/openairinterface5g into enhancement-10-harmony

Conflicts: openair1/PHY/defs.h targets/RT/USER/lte-enb.c targets/RT/USER/lte-softmodem.c
2016-07-23 01:23:06 -07:00
parent 6e4d361eb3 2e29052ff4
commit b1e633bb94
7 changed files with 152 additions and 219 deletions
@@ -1132,7 +1132,7 @@ void init_ocm(void)
    get_beta_map_up();
 #endif
    get_MIESM_param();
-
+    
    //load_pbch_desc();
  }