From: Marion Guthmuller <marion.guthmuller@loria.fr>
Date: Wed, 7 Dec 2011 12:12:22 +0000 (+0100)
Subject: Merge branch 'master' into MC_LTL
X-Git-Tag: exp_20120216~133^2~14
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/9b605c24eb28349bfb6d61da080733e19a7cb9a2

Merge branch 'master' into MC_LTL

Conflicts:
	buildtools/Cmake/DefinePackages.cmake
---

9b605c24eb28349bfb6d61da080733e19a7cb9a2
diff --cc buildtools/Cmake/DefinePackages.cmake
index e2e3abb671,4708dd7f6b..d163aafd2a
--- a/buildtools/Cmake/DefinePackages.cmake
+++ b/buildtools/Cmake/DefinePackages.cmake
@@@ -16,8 -16,6 +16,7 @@@ set(EXTRA_DIS
  	src/xbt/backtrace_windows.c
  	src/xbt/backtrace_dummy.c
  	src/xbt/setset_private.h
- 	src/xbt/parmap_private.h
 +	src/xbt/automatonparse_promela.c
  	src/xbt/mmalloc/attach.c
  	src/xbt/mmalloc/detach.c	
  	src/xbt/mmalloc/keys.c