From: Arnaud Giersch <arnaud.giersch@iut-bm.univ-fcomte.fr>
Date: Fri, 8 Nov 2013 23:00:32 +0000 (+0100)
Subject: Merge tag 'v3_10_rc2'
X-Git-Tag: v3_11_beta~341
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/b54b0de1100a656106aa33ebb0afa5f1ead365d4

Merge tag 'v3_10_rc2'

Conflicts:
	CMakeLists.txt
	ChangeLog
---

b54b0de1100a656106aa33ebb0afa5f1ead365d4
diff --cc ChangeLog
index c451e1fb8a,0b9ae9e53d..0fa53318df
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,14 -1,4 +1,14 @@@
 +SimGrid (3.11) NOT RELEASED; urgency=low
 +
 + TENTATIVE RELEASE GOALS for 3.11:
 + * Consider the removal of Supernovae mode if no user has manifested since the
 +   release of version 3.10.
 + * Switch to tesh.pl, and kill the now unused parts of xbt that seem fragile
 + * Switch to surf++, and reintegrate the hypervisor branch on top of it
 +
 + -- $date Da SimGrid team <simgrid-devel@lists.gforge.inria.fr>
 +
- SimGrid (3.10-rc1) unstable; urgency=low
+ SimGrid (3.10-rc2) unstable; urgency=low
  
   The Clean Diaper Release, a.k.a. SimGrid is leak-free.