From: Martin Quinson <martin.quinson@loria.fr>
Date: Wed, 28 Dec 2016 16:16:34 +0000 (+0100)
Subject: as expected, here is a fix release :(
X-Git-Tag: v3_14_159
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/7a2ebfa7c0ea7d31a64e6fa8c930558bdfe5ddcc

as expected, here is a fix release :(
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 258f10a9c1..c7d2e5db81 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -90,7 +90,7 @@ endif()
 
 set(SIMGRID_VERSION_MAJOR "3")
 set(SIMGRID_VERSION_MINOR "14")
-set(SIMGRID_VERSION_PATCH "0")
+set(SIMGRID_VERSION_PATCH "159")
 # set(SIMGRID_VERSION_EXTRA "-alpha") # Extra words to add to version string (e.g. -rc1)
 
 set(SIMGRID_VERSION_DATE  "2016") # Year for copyright information
diff --git a/ChangeLog b/ChangeLog
index 70bc7114b6..7f50cb74e7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+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