From: Jim Jagielski <jim@apache.org>
Date: Thu, 4 Jun 2015 16:15:38 +0000 (+0000)
Subject: and we are 2.4.14-dev
X-Git-Tag: 2.4.14~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0f92cda64fd8d089dbb74de8398b290259d872a3;p=thirdparty%2Fapache%2Fhttpd.git

and we are 2.4.14-dev


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1683585 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index 517a9299ae9..5b31673b62c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,8 @@
                                                          -*- coding: utf-8 -*-
 
+Changes with Apache 2.4.14
+
+
 Changes with Apache 2.4.13
 
   *) SECURITY: CVE-2015-0253 (cve.mitre.org)
diff --git a/STATUS b/STATUS
index 6b6de0f06dc..585f7226217 100644
--- a/STATUS
+++ b/STATUS
@@ -34,6 +34,7 @@ Release history:
     [NOTE that x.{odd}.z versions are strictly Alpha/Beta releases,
           while x.{even}.z versions are Stable/GA releases.]
 
+    2.4.14  : In development.
     2.4.13  : Tagged on June 4, 2015.
     2.4.12  : Tagged on January 22, 2015. Released Jan 29, 2015
     2.4.11  : Tagged on January 15, 2015. Not released.
diff --git a/docs/manual/style/version.ent b/docs/manual/style/version.ent
index c42bef95549..1815b1f2b00 100644
--- a/docs/manual/style/version.ent
+++ b/docs/manual/style/version.ent
@@ -19,6 +19,6 @@
 
 <!ENTITY httpd.major "2">
 <!ENTITY httpd.minor "4">
-<!ENTITY httpd.patch "13">
+<!ENTITY httpd.patch "14">
 
 <!ENTITY httpd.docs "2.4">
diff --git a/include/ap_release.h b/include/ap_release.h
index 5eff4159349..57e9a0cfd5a 100644
--- a/include/ap_release.h
+++ b/include/ap_release.h
@@ -43,8 +43,8 @@
 
 #define AP_SERVER_MAJORVERSION_NUMBER 2
 #define AP_SERVER_MINORVERSION_NUMBER 4
-#define AP_SERVER_PATCHLEVEL_NUMBER   13
-#define AP_SERVER_DEVBUILD_BOOLEAN    0
+#define AP_SERVER_PATCHLEVEL_NUMBER   14
+#define AP_SERVER_DEVBUILD_BOOLEAN    1
 
 /* Synchronize the above with docs/manual/style/version.ent */