merge branches

diff --cc ChangeLog
index bc77f6c,35da579..b3d154b
--- 1/ChangeLog
--- 2/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.