From: Eric Covener <covener@apache.org>
Date: Fri, 11 Nov 2011 21:04:23 +0000 (+0000)
Subject: bump to 2.4.0-dev and 2.4.0 in version.ent
X-Git-Tag: 2.3.16~191
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=7d92e649529c85e0aca2ec7385732390c434f3ee;p=thirdparty%2Fapache%2Fhttpd.git

bump to 2.4.0-dev and 2.4.0 in version.ent


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

diff --git a/docs/manual/style/version.ent b/docs/manual/style/version.ent
index eaf37017895..706c06a134c 100644
--- a/docs/manual/style/version.ent
+++ b/docs/manual/style/version.ent
@@ -18,7 +18,7 @@
 -->
 
 <!ENTITY httpd.major "2">
-<!ENTITY httpd.minor "3">
-<!ENTITY httpd.patch "16">
+<!ENTITY httpd.minor "4">
+<!ENTITY httpd.patch "0">
 
-<!ENTITY httpd.docs "trunk">
+<!ENTITY httpd.docs "2.4">
diff --git a/include/ap_release.h b/include/ap_release.h
index e267443f012..f50e0da3224 100644
--- a/include/ap_release.h
+++ b/include/ap_release.h
@@ -44,8 +44,8 @@
 #define AP_SERVER_BASEPRODUCT "Apache"
 
 #define AP_SERVER_MAJORVERSION_NUMBER 2
-#define AP_SERVER_MINORVERSION_NUMBER 3
-#define AP_SERVER_PATCHLEVEL_NUMBER   16
+#define AP_SERVER_MINORVERSION_NUMBER 4
+#define AP_SERVER_PATCHLEVEL_NUMBER   0
 #define AP_SERVER_DEVBUILD_BOOLEAN    1
 
 /* Synchronize the above with docs/manual/style/version.ent */