From: Arnaud Giersch <arnaud.giersch@iut-bm.univ-fcomte.fr>
Date: Mon, 4 Nov 2013 13:25:45 +0000 (+0100)
Subject: Devel branch continues toward version 3.11.
X-Git-Tag: v3_11_beta~392^2
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/eebeda316738017bffec575a8a37a3307a4bdb9d?hp=3e4a847beed6640a47ddf93b4d31e33140b42632

Devel branch continues toward version 3.11.
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6adbbd2a62..61d40e484d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -45,13 +45,13 @@ set(CMAKE_Fortran_LINK_FLAGS "" CACHE TYPE INTERNAL FORCE)
 # 3.7.{0,1} -> release 3.7, 3.7.1
 # 3.8.{0,1} -> release 3.8, 3.8.1
 # 3.9.0 -> release 3.9
-
 # 3.9.90 -> release 3.10pre1
 # 3.10.0 -> release 3.10
+# 3.11.0 -> release 3.11
 
 set(SIMGRID_VERSION_MAJOR "3")
-set(SIMGRID_VERSION_MINOR "9")
-set(SIMGRID_VERSION_PATCH "90")
+set(SIMGRID_VERSION_MINOR "11")
+set(SIMGRID_VERSION_PATCH "0")
 
 if(${SIMGRID_VERSION_PATCH} EQUAL "0")
   set(release_version "${SIMGRID_VERSION_MAJOR}.${SIMGRID_VERSION_MINOR}")
diff --git a/ChangeLog b/ChangeLog
index b63150632c..4adffbd7a6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+SimGrid (3.11) NOT RELEASED; urgency=low
+
+ (to complete)
+
+ -- $date Da SimGrid team <simgrid-devel@lists.gforge.inria.fr>
+
 SimGrid (3.10pre1) unstable; urgency=low
 
  Java:
diff --git a/NEWS b/NEWS
index c658b016a3..4169d6e1b1 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,10 @@
+                    _               _____  _ _
+__   _____ _ __ ___(_) ___  _ __   |___ / / / |
+\ \ / / _ \ '__/ __| |/ _ \| '_ \    |_ \ | | |
+ \ V /  __/ |  \__ \ | (_) | | | |  ___) || | |
+  \_/ \___|_|  |___/_|\___/|_| |_| |____(_)_|_|
+
+(to complete)
                     _               _____  _  ___
 __   _____ _ __ ___(_) ___  _ __   |___ / / |/ _ \
 \ \ / / _ \ '__/ __| |/ _ \| '_ \    |_ \ | | | | |
@@ -10,10 +17,10 @@ The "to be named" release. Major changes:
  * Java is back in the main package (and is very stable).
  * The storage sub-modules is now believed to be usable.
  * SMPI is now very stable (we pass most MPICH tests).
- * Verification and model checking further improved: 
+ * Verification and model checking further improved:
    liveness+SMPI works; reduction through state equality detection
  Plus the usual load of bug fixes and small improvements
- 
+
                     _               _____ ___
 __   _____ _ __ ___(_) ___  _ __   |___ // _ \
 \ \ / / _ \ '__/ __| |/ _ \| '_ \    |_ \ (_) |