summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam A. Rowe Jr <wrowe@apache.org>2006-07-27 17:26:10 +0000
committerWilliam A. Rowe Jr <wrowe@apache.org>2006-07-27 17:26:10 +0000
commitc3e9b3600b39dc7417abcfb2e6f21559fef3673b (patch)
tree79a3064cefad2a996acd2ae1469580c9b69ee502
parentbc0d4bbf17f8233c30188b73f0b3e13809ca88af (diff)
downloadhttpd-c3e9b3600b39dc7417abcfb2e6f21559fef3673b.tar.gz
Bump after tag
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@426157 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--CHANGES4
-rw-r--r--STATUS1
-rw-r--r--include/ap_release.h4
3 files changed, 7 insertions, 2 deletions
diff --git a/CHANGES b/CHANGES
index ce7fd42259..558a9ca34e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,8 @@
-*- coding: utf-8 -*-
+Changes with Apache 2.0.60
+
+
+
Changes with Apache 2.0.59
*) SECURITY: CVE-2006-3747 (cve.mitre.org)
diff --git a/STATUS b/STATUS
index 6bd5572ca6..df63084d06 100644
--- a/STATUS
+++ b/STATUS
@@ -23,6 +23,7 @@ Consult the trunk/ for all new development and documentation efforts:
Release history:
+ 2.0.60 : in maintenance
2.0.59 : tagged July 27, 2006
2.0.58 : released May 1, 2006 as GA.
2.0.57 : tagged April 19, 2006, not released.
diff --git a/include/ap_release.h b/include/ap_release.h
index 77b9417424..83a2d1a9cb 100644
--- a/include/ap_release.h
+++ b/include/ap_release.h
@@ -39,8 +39,8 @@
#define AP_SERVER_MAJORVERSION_NUMBER 2
#define AP_SERVER_MINORVERSION_NUMBER 0
-#define AP_SERVER_PATCHLEVEL_NUMBER 59
-#define AP_SERVER_ADD_STRING ""
+#define AP_SERVER_PATCHLEVEL_NUMBER 60
+#define AP_SERVER_ADD_STRING "-dev"
/* keep old macros as well */
#define AP_SERVER_MAJORVERSION APR_STRINGIFY(AP_SERVER_MAJORVERSION_NUMBER)