From: Jim Jagielski <jim@apache.org>
Date: Tue, 28 Jun 2011 17:18:24 +0000 (+0000)
Subject: And roll on to 2.3.14
X-Git-Tag: 2.3.14^2~101
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fa8dc749ee34685c7beb3d0aea1a45a50b98c600;p=thirdparty%2Fapache%2Fhttpd.git

And roll on to 2.3.14

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1140734 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index 686240c042d..f531be8e31f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,8 @@
                                                          -*- coding: utf-8 -*-
 
+Changes with Apache 2.3.14
+
+
 Changes with Apache 2.3.13
 
   *) ab: Support specifying the local address to use. PR 48930.
diff --git a/STATUS b/STATUS
index 421294ce513..813f720ce82 100644
--- a/STATUS
+++ b/STATUS
@@ -26,6 +26,7 @@ Release history:
     [NOTE that x.{odd}.z versions are strictly Alpha/Beta releases,
           while x.{even}.z versions are Stable/GA releases.]
 
+    2.3.14  : In development.
     2.3.13  : Tagged on June 28, 2011.
     2.3.12  : Tagged on May 11, 2011. Released May 23, 2011.
     2.3.11  : Released as Beta on March 7, 2011.
diff --git a/docs/manual/style/version.ent b/docs/manual/style/version.ent
index e9ad722f659..43e507338c1 100644
--- a/docs/manual/style/version.ent
+++ b/docs/manual/style/version.ent
@@ -19,6 +19,6 @@
 
 <!ENTITY httpd.major "2">
 <!ENTITY httpd.minor "3">
-<!ENTITY httpd.patch "13">
+<!ENTITY httpd.patch "14">
 
 <!ENTITY httpd.docs "trunk">
diff --git a/include/ap_release.h b/include/ap_release.h
index 3eb809f03a2..fdf6554b00d 100644
--- a/include/ap_release.h
+++ b/include/ap_release.h
@@ -45,8 +45,8 @@
 
 #define AP_SERVER_MAJORVERSION_NUMBER 2
 #define AP_SERVER_MINORVERSION_NUMBER 3
-#define AP_SERVER_PATCHLEVEL_NUMBER   13
-#define AP_SERVER_DEVBUILD_BOOLEAN    0
+#define AP_SERVER_PATCHLEVEL_NUMBER   14
+#define AP_SERVER_DEVBUILD_BOOLEAN    1
 
 #if AP_SERVER_DEVBUILD_BOOLEAN
 #define AP_SERVER_ADD_STRING          "-dev"