From: Frederic Suter <frederic.suter@cc.in2p3.fr>
Date: Wed, 25 Sep 2019 15:36:39 +0000 (+0200)
Subject: Merge branch 'master' of https://framagit.org/simgrid/simgrid
X-Git-Tag: v3.24~67^2
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/9512fd8f4546e5f260127e8d6206c44bddccae41

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

9512fd8f4546e5f260127e8d6206c44bddccae41
diff --cc ChangeLog
index 22c2c5d18b,985ace680c..55e1c9cda5
--- a/ChangeLog
+++ b/ChangeLog
@@@ -60,7 -60,8 +60,8 @@@ Fixed bugs (FG#.. -> framagit bugs; FG!
   - FG!15: execute_flops now logs compute
   - FG!16: Fix the ns-3 bindings when several flows are simultaneously finishing
   - FG!17: ns-3: unblock the right number of communications + others issues
+  - FG!18: Improving the performance of the ns-3 bindings
 -
 + - GH#207: Error in the throughput of TCP transfer
  ----------------------------------------------------------------------------
  
  SimGrid (3.23.2) July 8. 2019