From: Jim Jagielski <jim@apache.org>
Date: Fri, 16 Dec 2016 18:26:03 +0000 (+0000)
Subject: and we are now 2.4.26-dev
X-Git-Tag: 2.4.26~448
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7f6965ccaa4fec31274c05a101fdc23c684762cc;p=apache

and we are now 2.4.26-dev


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

diff --git a/CHANGES b/CHANGES
index 52d1b50948..ffaf8c4b3a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,7 @@
                                                          -*- coding: utf-8 -*-
 
+Changes with Apache 2.4.26
+
 Changes with Apache 2.4.25
 
   *) Fix some build issues related to various modules.
diff --git a/STATUS b/STATUS
index cbe86ca35a..33e5f266f1 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.26  : In development.
     2.4.25  : Tagged on December 16, 2016.
     2.4.24  : Tagged on December 16, 2016, not released.
     2.4.23  : Tagged on June 30, 2016. Released on July 05, 2016.
diff --git a/docs/manual/style/version.ent b/docs/manual/style/version.ent
index 0c2a5f3868..b527680139 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 "25">
+<!ENTITY httpd.patch "26">
 
 <!ENTITY httpd.docs "2.4">
diff --git a/include/ap_release.h b/include/ap_release.h
index 92fe7dea8a..a8d8bfe863 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   25
-#define AP_SERVER_DEVBUILD_BOOLEAN    0
+#define AP_SERVER_PATCHLEVEL_NUMBER   26
+#define AP_SERVER_DEVBUILD_BOOLEAN    1
 
 /* Synchronize the above with docs/manual/style/version.ent */