From: Marion Guthmuller <marion.guthmuller@loria.fr>
Date: Tue, 22 Nov 2011 17:05:23 +0000 (+0100)
Subject: merge conflicts
X-Git-Tag: exp_20120216~133^2~35
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/edde8f7fbc1b74a81551bf9eb7bac1935b999296?hp=--cc

merge conflicts
---

edde8f7fbc1b74a81551bf9eb7bac1935b999296
diff --cc buildtools/Cmake/DefinePackages.cmake
index 4a71b6c0c2,8a97107b1d..e2e3abb671
--- a/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 src/mc/memory_map.c
index 16e8e02c3a,7496b501db..ca5a15e257
--- a/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;
  }