From: Martin Quinson <martin.quinson@ens-rennes.fr>
Date: Thu, 16 May 2019 09:08:59 +0000 (+0200)
Subject: Merge branch 'master' of framagit.org:simgrid/simgrid
X-Git-Tag: v3.22.4~126^2
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/e2767b564d5b6f3da982646b3cc7537fa05aa34d?hp=--cc

Merge branch 'master' of framagit.org:simgrid/simgrid
---

e2767b564d5b6f3da982646b3cc7537fa05aa34d
diff --cc ChangeLog
index 7dd1b9a45b,a84b49e968..1f670a58d4
--- a/ChangeLog
+++ b/ChangeLog
@@@ -2,7 -2,7 +2,8 @@@ SimGrid (3.23) NOT RELEASED (Release Ta
  
  General:
   - Stop setting random seed with srand48() at initialization.
 + - Use addr2line as a fallback for stacktraces when backtrace is not available.
+  - Build option -Denable_documentation is now OFF by default.
  
  XBT:
   - New log appenders: stdout and stderr. Use stdout for xbt_help.