From: Martin Quinson <martin.quinson@loria.fr>
Date: Wed, 22 Mar 2017 16:50:52 +0000 (+0100)
Subject: release v3.15
X-Git-Tag: v3_15
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/b9fcf6001f08df257b591fcf07979783ceb86582

release v3.15
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 70b1bf2a1f..8f69dc8faf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -91,9 +91,9 @@ endif()
 set(SIMGRID_VERSION_MAJOR "3")
 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_EXTRA "") # Extra words to add to version string (e.g. -rc1)
 
-set(SIMGRID_VERSION_DATE  "2016") # Year for copyright information
+set(SIMGRID_VERSION_DATE  "2017") # Year for copyright information
 
 if(${SIMGRID_VERSION_PATCH} EQUAL "0")
   set(release_version "${SIMGRID_VERSION_MAJOR}.${SIMGRID_VERSION_MINOR}")
diff --git a/ChangeLog b/ChangeLog
index 257051a461..df8ca0e7e0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -87,7 +87,7 @@ SimGrid (3.15) stable; urgency=low
  - A <cluster> can now be created with different speed values to represent pstates.
    see examples/platforms/energy_cluster.xml for an example.
 
- -- Wed Mar 22 15:36:09 CET 2017 -- Da SimGrid team <simgrid-devel@lists.gforge.inria.fr>
+ -- Wed Mar 22 17:50:21 CET 2017 -- Da SimGrid team <simgrid-devel@lists.gforge.inria.fr>
 
 SimGrid (3.14.159) stable; urgency=low