]> granicus.if.org Git - apache/commitdiff
Promote.
authorGraham Leggett <minfrin@apache.org>
Tue, 28 May 2013 14:24:40 +0000 (14:24 +0000)
committerGraham Leggett <minfrin@apache.org>
Tue, 28 May 2013 14:24:40 +0000 (14:24 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1486935 13f79535-47bb-0310-9956-ffa450edef68

STATUS

diff --git a/STATUS b/STATUS
index 1b51b794e3ac4c981536d1f9b529acfc67723d36..fc05e37af98e706039ef2a62c3ccebce614591eb 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -89,7 +89,20 @@ RELEASE SHOWSTOPPERS:
 
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
-  
+    * libhttpd.dsp: Fix Debug build mentioned by fuankg in
+      http://mail-archives.apache.org/mod_mbox/httpd-dev/201305.mbox/%3C519FC54E.901@apache.org%3E.
+      trunk patch: http://svn.apache.org/r1486490
+      2.4.x patch: trunk patch works
+      +1: gsmith, jim, minfrin
+
+    * makefile.win: Adjust makefile to properly detect the need to use devenv
+      on applicable MSVC versions.
+      trunk patch: http://svn.apache.org/r1482041
+      2.4.x patch: trunk patch works with offset
+      +1: gsmith, jim, minfrin
+
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -294,18 +307,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
       2.4.x patch: trunk works, modulo CHANGES
       +1: minfrin, jim
 
-    * libhttpd.dsp: Fix Debug build mentioned by fuankg in
-      http://mail-archives.apache.org/mod_mbox/httpd-dev/201305.mbox/%3C519FC54E.901@apache.org%3E.
-      trunk patch: http://svn.apache.org/r1486490
-      2.4.x patch: trunk patch works
-      +1: gsmith, jim, minfrin
-
-    * makefile.win: Adjust makefile to properly detect the need to use devenv
-      on applicable MSVC versions.
-      trunk patch: http://svn.apache.org/r1482041
-      2.4.x patch: trunk patch works with offset
-      +1: gsmith, jim, minfrin
-
     * core: Add post_perdir_config hook.
       trunk patch: http://svn.apache.org/r1368121
       2.4.x patch: trunk patch works modulo CHANGES and mmn bump