From: Martin Quinson <martin.quinson@loria.fr>
Date: Sat, 24 Dec 2016 21:43:26 +0000 (+0100)
Subject: merry chrismas
X-Git-Tag: v3_14
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/3cac0e6f94a1c80d192d6d7c0076509b01028854

merry chrismas
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b2c7837043..258f10a9c1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -89,9 +89,9 @@ endif()
 #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
 
 set(SIMGRID_VERSION_MAJOR "3")
-set(SIMGRID_VERSION_MINOR "13")
-set(SIMGRID_VERSION_PATCH "91")
-set(SIMGRID_VERSION_EXTRA "-alpha") # Extra words to add to version string (e.g. -rc1)
+set(SIMGRID_VERSION_MINOR "14")
+set(SIMGRID_VERSION_PATCH "0")
+# set(SIMGRID_VERSION_EXTRA "-alpha") # Extra words to add to version string (e.g. -rc1)
 
 set(SIMGRID_VERSION_DATE  "2016") # Year for copyright information
 
diff --git a/ChangeLog b/ChangeLog
index 8154c71477..74df3ddcbf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-SimGrid (3.14) UNRELEASED; urgency=low
+SimGrid (3.14) stable; urgency=low
 
  Documentation
  * The whole documentation was reworked and reorganized. There is
@@ -69,7 +69,7 @@ SimGrid (3.14) UNRELEASED; urgency=low
  * ex/app_tokenring: new example, very similar to the MSG Token Ring
  * ex/async_waitAll: new example, on asynchronous communications
 
- -- $date Da SimGrid team <simgrid-devel@lists.gforge.inria.fr>
+ -- Sat Dec 24 22:34:26 CET 2016 Da SimGrid team <simgrid-devel@lists.gforge.inria.fr>
 
 SimGrid (3.13) stable; urgency=low
 
diff --git a/NEWS b/NEWS
index 62edbef265..5be43efe92 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,7 @@ __   _____ _ __ ___(_) ___  _ __   |___ / / | || |
 \ \ / / _ \ '__/ __| |/ _ \| '_ \    |_ \ | | || |_
  \ V /  __/ |  \__ \ | (_) | | | |  ___) || |__   _|
   \_/ \___|_|  |___/_|\___/|_| |_| |____(_)_|  |_|
+               Dec 24 2016
 
 The Chrismas Pi Release.