From: mquinson <mquinson@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Wed, 1 Dec 2010 22:53:46 +0000 (+0000)
Subject: The development cycle of 3.6 is officially open. Please enjoy.
X-Git-Tag: v3.6_beta2~1054
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/1ffdd396453f2191ace53c1e714e88d292fcad6b

The development cycle of 3.6 is officially open. Please enjoy.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@8858 48e7efb5-ca39-0410-a469-dd3cf9ba447f
---

diff --git a/ChangeLog b/ChangeLog
index 117b3ee4cb..8716dddc88 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
-SimGrid (3.5) unstable; urgency=low
+SimGrid (3.6) unstable; urgency=low
+
+ -- Da SimGrid team <simgrid-devel@lists.gforge.inria.fr>
+
+SimGrid (3.5) stable; urgency=medium
 
  Model Checking
  * New feature to any SimGrid-based simulator: Model-Checking
@@ -197,7 +201,7 @@ SimGrid (3.5) unstable; urgency=low
  * The effect of gras_stub_generator can be achieved through
    lua too (check examples/gras/console/ping_generator.lua)
 
- -- Da SimGrid team <simgrid-devel@lists.gforge.inria.fr>
+ -- Wed, 01 Dec 2010 22:09:23 +0100 Da SimGrid team <simgrid-devel@lists.gforge.inria.fr>
 
 SimGrid (3.4.1) stable; urgency=low
 
diff --git a/NEWS b/NEWS
index ecb4a677b0..cd9cc3a7b9 100644
--- a/NEWS
+++ b/NEWS
@@ -5,7 +5,7 @@ __   _____ _ __ ___(_) ___  _ __   |___ / | ___|
   \_/ \___|_|  |___/_|\___/|_| |_| |____(_)____/
 
 The "Winter in Frejus" release. Also known as "ANR/ADT funding helps"
-(major changes):
+Major changes are:
 
  * New feature: Model check any simgrid simulation
  * SMPI: now considered stable