merge conflicts

diff --cc buildtools/Cmake/DefinePackages.cmake
index 4a71b6c,8a97107..e2e3abb
--- 1/buildtools/Cmake/DefinePackages.cmake
--- 2/buildtools/Cmake/DefinePackages.cmake
+++ b/buildtools/Cmake/DefinePackages.cmake
@@@ -406,8 -410,7 +413,9 @@@ set(headers_to_instal
        include/xbt/mmalloc.h
        include/xbt/replay_trace_reader.h
        include/xbt/parmap.h
 +      include/xbt/automaton.h
 +      include/xbt/automatonparse_promela.h
+       include/simgrid/platf.h
        include/mc/modelchecker.h
        include/msg/msg.h
        include/msg/datatypes.h

diff --cc include/msg/msg.h
Simple merge

diff --cc src/mc/mc_global.c
Simple merge

diff --cc src/mc/memory_map.c
index 16e8e02,7496b50..ca5a15e
--- 1/src/mc/memory_map.c
--- 2/src/mc/memory_map.c
+++ b/src/mc/memory_map.c
@@@ -138,11 -131,9 +138,10 @@@ memory_map_t get_memory_map(void
          xbt_realloc(ret->regions, sizeof(memreg) * (ret->mapsize + 1));
      memcpy(ret->regions + ret->mapsize, &memreg, sizeof(memreg));
      ret->mapsize++;
 +
    }
  
-   if (line)
-     free(line);
+   free(line);
  
    return ret;
  }

diff --cc src/msg/msg_global.c
Simple merge

diff --cc src/simix/smx_smurf.c
Simple merge

diff --cc src/xbt/dynar.c
Simple merge

diff --cc src/xbt/mmalloc/mm_legacy.c
Simple merge