You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by jc...@apache.org on 2017/05/23 16:28:46 UTC
svn commit: r1795931 - in /httpd/httpd/trunk: ./ build/apr_common.m4
build/find_apr.m4 build/find_apu.m4
Author: jchampion
Date: Tue May 23 16:28:46 2017
New Revision: 1795931
URL: http://svn.apache.org/viewvc?rev=1795931&view=rev
Log:
Merge in APR[-util] macros from branches/trunk-buildconf-noapr
Added:
httpd/httpd/trunk/build/apr_common.m4
- copied unchanged from r1795930, httpd/httpd/branches/trunk-buildconf-noapr/build/apr_common.m4
httpd/httpd/trunk/build/find_apr.m4
- copied unchanged from r1795930, httpd/httpd/branches/trunk-buildconf-noapr/build/find_apr.m4
httpd/httpd/trunk/build/find_apu.m4
- copied unchanged from r1795930, httpd/httpd/branches/trunk-buildconf-noapr/build/find_apu.m4
Modified:
httpd/httpd/trunk/ (props changed)
Propchange: httpd/httpd/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 23 16:28:46 2017
@@ -1,5 +1,5 @@
/httpd/httpd/branches/revert-ap-ldap:1150158-1150173
-/httpd/httpd/branches/trunk-buildconf-noapr:1780253-1780970
+/httpd/httpd/branches/trunk-buildconf-noapr:1780253-1795930
/httpd/httpd/branches/trunk-openssl-threadid:1791053-1791848
/httpd/httpd/branches/trunk-override-index:1793921-1793931
/httpd/httpd/branches/trunk-test-integration:1777251-1782067