]> granicus.if.org Git - apache/commit
projects / apache / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: c0d6def) | patch
Merge r1200699 from trunk:
authorJim Jagielski <jim@apache.org>
Fri, 11 Nov 2011 17:25:11 +0000 (17:25 +0000)
committerJim Jagielski <jim@apache.org>
Fri, 11 Nov 2011 17:25:11 +0000 (17:25 +0000)
commitf184506d7ae4921d34784363f423479cc8c9295b
tree679f1fb59245a64caff172ea2492ee6d6560bb5dtree | snapshot
parentc0d6def62a0716a8999e6595508bf27b6b898685commit | diff
Merge r1200699 from trunk:

Fix installation of conf/extra/proxy-html.conf.

Otherwise httpd does no longer start, because
it is the only extra file required in the main
config at the moment.

Submitted by: rjung
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1200973 13f79535-47bb-0310-9956-ffa450edef68
Makefile.in diff | blob | history
NWGNUmakefile diff | blob | history
build/installwinconf.awk diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.