]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
update after backport
authorStefan Eissing <icing@apache.org>
Thu, 4 Apr 2019 13:31:37 +0000 (13:31 +0000)
committerStefan Eissing <icing@apache.org>
Thu, 4 Apr 2019 13:31:37 +0000 (13:31 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1856932 13f79535-47bb-0310-9956-ffa450edef68

STATUS

diff --git a/STATUS b/STATUS
index 9d04ebbd31e35a45f6415f9ae61c1b2704d7d25c..3caa8a7ed27ff5fb5ff9c9039f61c364f14dd49e 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -133,13 +133,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      2.4.x patch: svn merge -c 1856297 ^/httpd/httpd/trunk .
      +1: icing, jim, ylavic
 
-  *) modules/filters/config.m4: Make libxml2's inclusion of unicode/*.h files
-     a non-fatal warning/error under maintainer-mode.
-     trunk patch: http://svn.apache.org/r1850745
-                  http://svn.apache.org/r1855446
-     2.4.x patch: svn merge -c 1850745,1855446 ^/httpd/httpd/trunk .
-     +1: jim, covener, icing
-
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]