From: Arnaud Giersch <arnaud.giersch@iut-bm.univ-fcomte.fr>
Date: Mon, 4 Nov 2013 20:47:23 +0000 (+0100)
Subject: Merge branch 'v3_10_x'
X-Git-Tag: v3_11_beta~391
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/c892dfb9d21349fa65a0d9920f0884d2ba8e1b5c

Merge branch 'v3_10_x'

Conflicts:
	CMakeLists.txt
	ChangeLog

Fixed by defining current version as 3.11-devel.
---

c892dfb9d21349fa65a0d9920f0884d2ba8e1b5c
diff --cc CMakeLists.txt
index 61d40e484d,31167abbd1..a00593a100
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -47,11 -47,13 +47,14 @@@ set(CMAKE_Fortran_LINK_FLAGS "" CACHE T
  # 3.9.0 -> release 3.9
  # 3.9.90 -> release 3.10pre1
  # 3.10.0 -> release 3.10
 +# 3.11.0 -> release 3.11
  
  set(SIMGRID_VERSION_MAJOR "3")
 -set(SIMGRID_VERSION_MINOR "10")
 +set(SIMGRID_VERSION_MINOR "11")
  set(SIMGRID_VERSION_PATCH "0")
 -set(SIMGRID_VERSION_EXTRA "-rc1") # 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  "2013") # Year for copyright information
  
  if(${SIMGRID_VERSION_PATCH} EQUAL "0")
    set(release_version "${SIMGRID_VERSION_MAJOR}.${SIMGRID_VERSION_MINOR}")
diff --cc ChangeLog
index 4adffbd7a6,aee9eedbf1..ee0c4e5cf6
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,10 -1,4 +1,10 @@@
 +SimGrid (3.11) NOT RELEASED; urgency=low
 +
 + (to complete)
 +
 + -- $date Da SimGrid team <simgrid-devel@lists.gforge.inria.fr>
 +
- SimGrid (3.10pre1) unstable; urgency=low
+ SimGrid (3.10-rc1) unstable; urgency=low
  
   Java:
   * Reintegrate Java to the main archive as desynchronizing these