From: Arnaud Giersch <arnaud.giersch@iut-bm.univ-fcomte.fr>
Date: Fri, 15 Nov 2013 15:57:35 +0000 (+0100)
Subject: Prepare to release version 3.10.
X-Git-Tag: v3_10~6
X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/00b77bafc73176abca8c460514111bfde18c2e46?hp=5394767c7f52ab1caf56a3ae70b169abc0d97f1e

Prepare to release version 3.10.
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a21be2a88f..de63700be8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -51,7 +51,7 @@ set(CMAKE_Fortran_LINK_FLAGS "" CACHE TYPE INTERNAL FORCE)
 set(SIMGRID_VERSION_MAJOR "3")
 set(SIMGRID_VERSION_MINOR "10")
 set(SIMGRID_VERSION_PATCH "0")
-set(SIMGRID_VERSION_EXTRA "-rc2") # 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  "2013") # Year for copyright information
 
diff --git a/ChangeLog b/ChangeLog
index e697338b8c..892e6ce86b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-SimGrid (3.10-rc2) unstable; urgency=low
+SimGrid (3.10) stable; urgency=low
 
  The Clean Diaper Release, a.k.a. SimGrid is leak-free.
 
@@ -95,7 +95,7 @@ SimGrid (3.10-rc2) unstable; urgency=low
  * Supernovae builds are deprecated, and expected to be removed in the next
    version of SimGrid.
 
- -- Fri Nov  8 23:54:56 CET 2013 Da SimGrid team <simgrid-devel@lists.gforge.inria.fr>
+ -- Fri Nov 15 16:56:21 CET 2013 Da SimGrid team <simgrid-devel@lists.gforge.inria.fr>
 
 SimGrid (3.9) stable; urgency=low
 
diff --git a/NEWS b/NEWS
index d6013094c4..6db6852542 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,7 @@ __   _____ _ __ ___(_) ___  _ __   |___ / / |/ _ \
 \ \ / / _ \ '__/ __| |/ _ \| '_ \    |_ \ | | | | |
  \ V /  __/ |  \__ \ | (_) | | | |  ___) || | |_| |
   \_/ \___|_|  |___/_|\___/|_| |_| |____(_)_|\___/
+                Nov 15 2013
 
 The Clean Diaper Release, a.k.a. SimGrid is leak-free. Major changes: