X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/22a515f9ce5fdd9bc52950f872cf576f0222ea84..6bef2f5f125c1550ab944ea64474083ae6035c96:/ChangeLog?ds=sidebyside

diff --git a/ChangeLog b/ChangeLog
index fd2e22e47e..ee50307006 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,6 +16,7 @@ Plugins:
 
 simix:
  - Add parameter --cfg=simix/breakpoint to raise a SIGTRAP at given time.
+ - kill simix::onDeadlock() that was somewhat dupplicating s4u::on_deadlock()
 
 SMPI:
  - Replay: The replay file has been re-written in C++.
@@ -26,6 +27,9 @@ XBT:
  - Config: the C API is now deprecated (will be removed in 3.23), and
            the C++ API has been slightly improved.
 
+Other:
+ - Move simgrid_config.h to simgrid/config.h (old header still working)
+
 Fixed bugs:
  - #143: Setting a breakpoint at a given time
  - #258: daemonized actors hang after all non-daemonized actors have completed