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_11_beta~287
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/1df259e6d3147f6aee0de0cc9b14f0dcb4d35133

Prepare to release version 3.10.
(cherry picked from commit 00b77bafc73176abca8c460514111bfde18c2e46)

Conflicts:
	CMakeLists.txt
	ChangeLog
---

diff --git a/ChangeLog b/ChangeLog
index e37559f885..b81fec86e8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,7 +8,7 @@ SimGrid (3.11) NOT RELEASED; urgency=low
 
  -- $date Da SimGrid team <simgrid-devel@lists.gforge.inria.fr>
 
-SimGrid (3.10-rc2) unstable; urgency=low
+SimGrid (3.10) stable; urgency=low
 
  The Clean Diaper Release, a.k.a. SimGrid is leak-free.
 
@@ -105,7 +105,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 0d72f6b19d..c51990fe92 100644
--- a/NEWS
+++ b/NEWS
@@ -10,6 +10,7 @@ __   _____ _ __ ___(_) ___  _ __   |___ / / |/ _ \
 \ \ / / _ \ '__/ __| |/ _ \| '_ \    |_ \ | | | | |
  \ V /  __/ |  \__ \ | (_) | | | |  ___) || | |_| |
   \_/ \___|_|  |___/_|\___/|_| |_| |____(_)_|\___/
+                Nov 15 2013
 
 The Clean Diaper Release, a.k.a. SimGrid is leak-free. Major changes: