Merge conficts resolved

2021-02-02 09:36:49 +05:30
parent ca74163cdd 3b2d50374a
commit ae422aca1f
244 changed files with 2801 additions and 12579 deletions
@@ -488,7 +488,7 @@ int main( int argc, char **argv ) {
  set_taus_seed (0);

  cpuf=get_cpu_freq_GHz();
-  itti_init(TASK_MAX, THREAD_MAX, MESSAGES_ID_MAX, tasks_info, messages_info);
+  itti_init(TASK_MAX, tasks_info);

  init_opt() ;
  load_nrLDPClib();