From: Paul Bédaride <paul.bedaride@gmail.com>
Date: Mon, 2 Jun 2014 08:48:49 +0000 (+0200)
Subject: Init version 3.12
X-Git-Tag: v3_12~1029
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/137663894f564730ce8be22f994d8f9c1da1ade0

Init version 3.12
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 46d7b2041f..f89dd8d404 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -53,9 +53,9 @@ set(CMAKE_Fortran_LINK_FLAGS "" CACHE TYPE INTERNAL FORCE)
 # 3.11.0 -> release 3.11
 
 set(SIMGRID_VERSION_MAJOR "3")
-set(SIMGRID_VERSION_MINOR "11")
+set(SIMGRID_VERSION_MINOR "12")
 set(SIMGRID_VERSION_PATCH "0")
-#set(SIMGRID_VERSION_EXTRA "-devel") # Extra words to add to version string (e.g. -rc1)
+set(SIMGRID_VERSION_EXTRA "-devel") # Extra words to add to version string (e.g. -rc1)
 
 set(SIMGRID_VERSION_DATE  "2014") # Year for copyright information
 
diff --git a/ChangeLog b/ChangeLog
index a75125768c..9e4e0b47fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+SimGrid (3.12) NOT RELEASED; urgency=low
+
+
 SimGrid (3.11) stable; urgency=low
 
  The Class Release.
diff --git a/NEWS b/NEWS
index 15a56658e6..4279855b63 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,11 @@
+
+                    _               _____  _ ____
+__   _____ _ __ ___(_) ___  _ __   |___ / / |___ \
+\ \ / / _ \ '__/ __| |/ _ \| '_ \    |_ \ | | __) |
+ \ V /  __/ |  \__ \ | (_) | | | |  ___) || |/ __/
+  \_/ \___|_|  |___/_|\___/|_| |_| |____(_)_|_____|
+
+
                     _               _____  _ _
 __   _____ _ __ ___(_) ___  _ __   |___ / / / |
 \ \ / / _ \ '__/ __| |/ _ \| '_ \    |_ \ | | |