release v3.18

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b2faaf2..78df7eb 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -107,7 +107,7 @@ endif()
 set(SIMGRID_VERSION_MAJOR "3")
 set(SIMGRID_VERSION_MINOR "18")
 set(SIMGRID_VERSION_PATCH "0")
-set(SIMGRID_VERSION_EXTRA "-DEVEL") # Extra words to add to version string (e.g. -rc1)
+# set(SIMGRID_VERSION_EXTRA "-DEVEL") # Extra words to add to version string (e.g. -rc1)
 
 set(SIMGRID_VERSION_DATE  "2017") # Year for copyright information
 

diff --git a/ChangeLog b/ChangeLog
index 5ef7aa1..706c8a7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-SimGrid (3.18) NOT RELEASED YET (target: December 24 2017)
+SimGrid (3.18) Released December 24 2017
 
  The "Ho Ho Ho! SimGrid 4 beta is coming to town" release.
 

diff --git a/NEWS b/NEWS
index ec8a93a..6a8e6ab 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -3,12 +3,12 @@ __   _____ _ __ ___(_) ___  _ __   |___ / / |( _ )
 \ \ / / _ \ '__/ __| |/ _ \| '_ \    |_ \ | |/ _ \
  \ V /  __/ |  \__ \ | (_) | | | |  ___) || | (_) |
   \_/ \___|_|  |___/_|\___/|_| |_| |____(_)_|\___/
-               (not released yet)
+               December 24 2017
 
 The "Ho Ho Ho! SimGrid 4 beta is coming to town" release.
+  SimGrid 4 *may* be there by the next solstice.
 
- * Convert most of (but not all) MSG examples to S4U.
-   SimGrid 4 *may* be there by the next solstice.
+ * Convert almost all interesting MSG examples to S4U.
  * New model: energy consumption due to the network.
  * Major cleanups in the disk and storage subsystems.
  * (+ further deprecate XBT, bug fixes and doc improvement)