From: Martin Quinson <martin.quinson@loria.fr>
Date: Wed, 28 Dec 2016 23:28:33 +0000 (+0100)
Subject: next release will be 3.15
X-Git-Tag: v3_15~596
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/81606342f748dd45f481abe9171bccf7deac0fa5

next release will be 3.15
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c7d2e5db81..e41ea66331 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -89,9 +89,9 @@ endif()
 #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
 
 set(SIMGRID_VERSION_MAJOR "3")
-set(SIMGRID_VERSION_MINOR "14")
-set(SIMGRID_VERSION_PATCH "159")
-# set(SIMGRID_VERSION_EXTRA "-alpha") # Extra words to add to version string (e.g. -rc1)
+set(SIMGRID_VERSION_MINOR "15")
+set(SIMGRID_VERSION_PATCH "0")
+set(SIMGRID_VERSION_EXTRA "-DEVEL") # 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 7f50cb74e7..4e58ce7ae2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+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;