Merge branch 'v3_10_x'

Conflicts:
	CMakeLists.txt
	ChangeLog

Fixed by defining current version as 3.11-devel.

diff --combined CMakeLists.txt
index 61d40e4,31167ab..a00593a
--- 1/CMakeLists.txt
--- 2/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -47,17 -47,23 +47,24 @@@ 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}")
  else()
    set(release_version "${SIMGRID_VERSION_MAJOR}.${SIMGRID_VERSION_MINOR}.${SIMGRID_VERSION_PATCH}")
  endif()
+ 
+ set(SIMGRID_VERSION_STRING
+   "SimGrid version ${release_version}${SIMGRID_VERSION_EXTRA}\\nCopyright (c) ${SIMGRID_VERSION_DATE}. The Simgrid Team.")
+ 
  set(libsimgrid_version "${release_version}")
  set(libsimgrid-java_version "${release_version}")
  set(GCC_NEED_VERSION "4.0")

diff --combined ChangeLog
index 4adffbd,aee9eed..ee0c4e5
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,10 -1,4 +1,10 @@@
- SimGrid (3.10pre1) unstable; urgency=low
 +SimGrid (3.11) NOT RELEASED; urgency=low
 +
 + (to complete)
 +
 + -- $date Da SimGrid team <simgrid-devel@lists.gforge.inria.fr>
 +
+ SimGrid (3.10-rc1) unstable; urgency=low
  
   Java:
   * Reintegrate Java to the main archive as desynchronizing these
@@@ -82,6 -76,9 +82,9 @@@
     Unfortunately, calling exit may cause SimGrid to segfault, which is quite
     annoying when scripting around the simulator. Adding a
     --cfg=clean_atexit:no allows to circumvent this issue.
+  * New command line option --version, to get SimGrid version information.
+    Packagers may want to add extra words to SIMGRID_VERSION_EXTRA defined in
+    CMakeLists.txt.
  
  -- Mon Oct 7 2013 Da SimGrid team <simgrid-devel@lists.gforge.inria.fr>