X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/378011c751d126ed30d86f05871aa59ddb27b369..76673935f66c0e1606bb1cdc05f37be3c0a135b1:/ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 70bc7114b6..4e58ce7ae2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+SimGrid (3.15) UNRELEASED; urgency=low
+
+ -- target_date=March 20 2017 -- Da SimGrid team <simgrid-devel@lists.gforge.inria.fr>
+
+SimGrid (3.14.159) stable; urgency=low
+
+ The previous release was only a crude approximation of a Pi release;
+ this one should be a bit better.
+
+ - Revert a last minute change that broke on Mac OSX.
+ - Fix the changelog and NEWS files.
+ - Improve the documentation, in particular of the routing module.
+ - Integrate some patches flying around in Debian.
+
+ -- Wed Dec 28 17:14:49 CET 2016 Da SimGrid team <simgrid-devel@lists.gforge.inria.fr>
+
 SimGrid (3.14) stable; urgency=low
 
  Documentation