]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
Update proposal.
authorGraham Leggett <minfrin@apache.org>
Wed, 1 Jan 2020 19:18:57 +0000 (19:18 +0000)
committerGraham Leggett <minfrin@apache.org>
Wed, 1 Jan 2020 19:18:57 +0000 (19:18 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1872186 13f79535-47bb-0310-9956-ffa450edef68

STATUS

diff --git a/STATUS b/STATUS
index c6ad374dfd13f2e6139412a661f57312ce171bc7..c7efa137076eec06d9504c9e61e6082262de241d 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -287,7 +287,8 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      other than its target location, add that prefix to includes and library directories.
      Without this, apxs would fail to find config_vars.mk and exit.
      trunk patch: http://svn.apache.org/r1872042
-     2.4.x patch: svn merge -c 1872042 ^/httpd/httpd/trunk
+                  http://svn.apache.org/r1872062
+     2.4.x patch: svn merge -c 1872042,1872062 ^/httpd/httpd/trunk
      +1: minfrin