From: Martin Quinson <martin.quinson@loria.fr>
Date: Thu, 20 Oct 2011 08:25:30 +0000 (+0200)
Subject: merge branches
X-Git-Tag: exp_20120216~559
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/f783ed4680c6862a1b7543237e89d1221334bae0

merge branches
---

f783ed4680c6862a1b7543237e89d1221334bae0
diff --cc ChangeLog
index bc77f6ca2e,35da57939d..b3d154b6c9
--- a/ChangeLog
+++ b/ChangeLog
@@@ -127,7 -34,9 +127,9 @@@ SimGrid (3.6) stable; urgency=mediu
     into a Vivaldi routing model (based on the rule-based model). This allows to
     combine Vivaldi based latencies with last-mile platforms.
  
 - Simix
 + SIMIX
+  * Added a check for NaN of IEEE754 infinite in the double entries of 
+    the smx_user.c file
   * Introduce a new context factory "raw", highly inspirated from the
     ucontext factory, but using manually crafted functions in assembly to
     do the work in an efficient manner.