From: suter <frederic.suter@cc.in2p3.fr>
Date: Fri, 22 Jun 2012 13:25:14 +0000 (+0200)
Subject: Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot//simgrid/simgrid
X-Git-Tag: v3_8~487
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/aa69ffcb4328c83d2fd380c189c836993859228b?hp=14f6b4abd703b45e80e563263d8d409c0b766357

Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot//simgrid/simgrid
---

diff --git a/ChangeLog b/ChangeLog
index 3b5d1c4e95..5a06786b7e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,10 +2,14 @@ SimGrid (3.8) NOT RELEASED; urgency=low
 
  The "SimGrid makes psssshiiiit and jumps into the cloud" release.
 
- CMAKE:
+ Cmake:
  * Remove option custom_flags. Now use environment variables CFLAGS
    and LDFLAGS.
  * Enable tracing by default. This modules rocks you should use it.
+ * Use default cmake things to detect lua instead of home grown ones.
+ 
+ Documentation:
+ * Split the doc into a user guide and a reference guide.
 
  MSG:
  * Add an experimental interface to manipulate VMs. They are mainly
@@ -16,6 +20,7 @@ SimGrid (3.8) NOT RELEASED; urgency=low
    Please use MSG_init() instead. (reducing the amount of entry 
    points in the library helps us).
  * Make it impossible to link against the wrong version of the lib
+ * Bug fixes that made the host (and link) failures unusable.
 
  Simix:
  * Bug fixes around the resource failures: don't let the processes
@@ -39,7 +44,7 @@ SimGrid (3.8) NOT RELEASED; urgency=low
 
  XBT:
  * Functions xbt_dict_hash() and xbt_dict_hash_ext() are made public,
-  and renamed to xbt_str_hash() and xbt_str_ext()._
+   and renamed to xbt_str_hash() and xbt_str_hash_ext().
 
  -- $date Da SimGrid team <simgrid-devel@lists.gforge.inria.fr>