From: Martin Quinson <martin.quinson@loria.fr>
Date: Mon, 7 Oct 2013 08:43:17 +0000 (+0200)
Subject: get ready to release the first prerelease of 3.10 (3.10pre1)
X-Git-Tag: v3_9_90~38^2~42
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/04f1985717dc603738540676cb18e10e682c445e?hp=3eef1967487d565c4baae4d356599f833601c157

get ready to release the first prerelease of 3.10 (3.10pre1)
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b68c5034ec..4075afe3c4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -45,11 +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
 
 set(SIMGRID_VERSION_MAJOR "3")
-set(SIMGRID_VERSION_MINOR "10")
-set(SIMGRID_VERSION_PATCH "0")
+set(SIMGRID_VERSION_MINOR "9")
+set(SIMGRID_VERSION_PATCH "90")
 
 if(${SIMGRID_VERSION_PATCH} EQUAL "0")
   set(release_version "${SIMGRID_VERSION_MAJOR}.${SIMGRID_VERSION_MINOR}")
diff --git a/ChangeLog b/ChangeLog
index 9f1d4da51c..2afb0d3da8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-SimGrid (3.10) NOT RELEASED; urgency=low
+SimGrid (3.10pre1) unstable; urgency=low
 
  Java:
  * Reintegrate Java to the main archive as desynchronizing these
@@ -75,7 +75,7 @@ SimGrid (3.10) NOT RELEASED; urgency=low
    annoying when scripting around the simulator. Adding a
    --cfg=clean_atexit:yes allows to circumvent this issue.
 
--- $date Da SimGrid team <simgrid-devel@lists.gforge.inria.fr>
+-- Mon Oct 7 2013 Da SimGrid team <simgrid-devel@lists.gforge.inria.fr>
 
 SimGrid (3.9) stable; urgency=low