From: William A. Rowe Jr Date: Thu, 27 Jul 2006 17:26:10 +0000 (+0000) Subject: Bump after tag X-Git-Tag: 2.0.60~72 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c3e9b3600b39dc7417abcfb2e6f21559fef3673b;p=thirdparty%2Fapache%2Fhttpd.git Bump after tag git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@426157 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/CHANGES b/CHANGES index ce7fd422596..558a9ca34ed 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 6bd5572ca66..df63084d062 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 77b9417424d..83a2d1a9cb1 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)