From: Martin Quinson <martin.quinson@loria.fr>
Date: Wed, 21 Mar 2018 00:14:44 +0000 (+0100)
Subject: Start the dev of v3.20 (again)
X-Git-Tag: v3.20~673
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/c5d63722a4c7113966f6f9bc0eaa718b208a662e?hp=8db5361a6ca19fc40b22753d6eb3b249dd77ae00

Start the dev of v3.20 (again)

(cherry picked from commit e19d44d4735c16f7fd1d3da1a143388faae13edd)
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3ef54abf29..f12df62b42 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -106,8 +106,8 @@ endif()
 
 set(SIMGRID_VERSION_MAJOR "3")
 set(SIMGRID_VERSION_MINOR "19")
-set(SIMGRID_VERSION_PATCH "1")
-#set(SIMGRID_VERSION_EXTRA "-DEVEL") # Extra words to add to version string (e.g. -rc1)
+set(SIMGRID_VERSION_PATCH "90")
+set(SIMGRID_VERSION_EXTRA "-DEVEL") # Extra words to add to version string (e.g. -rc1)
 
 set(SIMGRID_VERSION_DATE  "2018") # Year for copyright information
 
diff --git a/ChangeLog b/ChangeLog
index 58493250cf..bf2c8c4e92 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+SimGrid (3.20) NOT RELEASED YET (Release target: June 21. 2018 10:07 UTC)
+
+----------------------------------------------------------------------------
+
 SimGrid (3.19.1) Released March 22 2018
 
  The Fixed ABI Release.
diff --git a/NEWS b/NEWS
index b9903b7183..dc270346a3 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,10 @@
+                    _               _____  ____   ___
+__   _____ _ __ ___(_) ___  _ __   |___ / |___ \ / _ \
+\ \ / / _ \ '__/ __| |/ _ \| '_ \    |_ \   __) | | | |
+ \ V /  __/ |  \__ \ | (_) | | | |  ___) | / __/| |_| |
+  \_/ \___|_|  |___/_|\___/|_| |_| |____(_)_____|\___/
+               (NOT RELEASED)
+
                     _               _____  _  ___   _
 __   _____ _ __ ___(_) ___  _ __   |___ / / |/ _ \ / |
 \ \ / / _ \ '__/ __| |/ _ \| '_ \    |_ \ | | (_) || |