Merge r14514 from 3_10_BRANCH (--> 3.10.0)

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@14521

diff --git a/NEWS b/NEWS
index 83abd6b343c767280a21b0624e90a61b1c13ecb7..88fc19b2ad362994cdac1b396e8a5472de8315c0 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,8 +1,6 @@
 
-Release 3.10.0 (mid September 2014)
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-3.10.0 is not yet released.  This is a beta of 3.10.0.
+Release 3.10.0 (10 September 2014)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 3.10.0 is a feature release with many improvements and the usual
 collection of bug fixes.
@@ -338,7 +336,9 @@ n-i-bz  Add support for BLKDISCARDZEROES ioctl
 n-i-bz  ppc32/64: fix a regression with the mtfsb0/mtfsb1 instructions
 n-i-bz  Add support for        sys_pivot_root and sys_unshare
 
-(3.10.0.BETA1: 2 September 2014, vex r2940, valgrind r14428)
+(3.10.0.BETA1:  2 September 2014, vex r2940, valgrind r14428)
+(3.10.0.BETA2:  8 September 2014, vex r2950, valgrind r14503)
+(3.10.0:       10 September 2014, vex r2950, valgrind r14514)
 
 
 

diff --git a/configure.ac b/configure.ac
index 8e16bdaf3a72690e2a485d949b429cddca70d9e3..4a5117728074371110cae6e30f35508e1c8bee5d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -8,7 +8,7 @@
 ##------------------------------------------------------------##
 
 # Process this file with autoconf to produce a configure script.
-AC_INIT([Valgrind],[3.10.0.BETA1],[valgrind-users@lists.sourceforge.net])
+AC_INIT([Valgrind],[3.10.0],[valgrind-users@lists.sourceforge.net])
 AC_CONFIG_SRCDIR(coregrind/m_main.c)
 AC_CONFIG_HEADERS([config.h])
 AM_INIT_AUTOMAKE([foreign subdir-objects])

diff --git a/docs/xml/vg-entities.xml b/docs/xml/vg-entities.xml
index 1433d06027a9ff9dc973eb34c321a1be127ab7b6..aeca2760c8120943659481f5f444fb79a9a8932e 100644 (file)
--- a/docs/xml/vg-entities.xml
+++ b/docs/xml/vg-entities.xml
@@ -2,12 +2,12 @@
 <!ENTITY vg-jemail     "julian@valgrind.org">
 <!ENTITY vg-vemail     "valgrind@valgrind.org">
 <!ENTITY cl-email      "Josef.Weidendorfer@gmx.de">
-<!ENTITY vg-lifespan   "2000-2013">
+<!ENTITY vg-lifespan   "2000-2014">
 
 <!-- valgrind release + version stuff -->
 <!ENTITY rel-type    "Release">
-<!ENTITY rel-version "3.9.0">
-<!ENTITY rel-date    "31 October 2013">
+<!ENTITY rel-version "3.10.0">
+<!ENTITY rel-date    "10 September 2014">
 
 <!-- where the docs are installed -->
 <!ENTITY vg-docs-path  "$INSTALL/share/doc/valgrind/html/index.html">