Commit 15e8288b authored by dgaudet's avatar dgaudet
Browse files

some messed up comments... just copied in the license again from...

some messed up comments... just copied in the license again from main/http_main.c hope that was right


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84748 13f79535-47bb-0310-9956-ffa450edef68
parent 1ee6df1c
Loading
Loading
Loading
Loading
+9 −9
Changes for build/build.mk: 9 added lines, 9 removed lines.
Original line number Diff line number Diff line
@@ -2,7 +2,8 @@
# Copyright (c) 1995-2000 The Apache Software Foundation.  All rights reserved.
# 
# Redistribution and use in source and binary forms, with or without 
# modification, are permitted provided that the following conditions            * are met:
# modification, are permitted provided that the following conditions 
# are met: 
# 
# 1. Redistributions of source code must retain the above copyright 
#    notice, this list of conditions and the following disclaimer.  
@@ -13,12 +14,11 @@
#    distribution. 
# 
# 3. All advertising materials mentioning features or use of this 
#    software must display the following acknowledgment:                        *    "This product includes software developed by the Apache Software Foundatio
#
#    software must display the following acknowledgment: 
#    "This product includes software developed by the Apache Software Foundation 
#    for use in the Apache HTTP server project (http://www.apache.org/)." 
# 
# 4. The names "Apache Server" and "Apache Software Foundation" must not be use
# to
# 4. The names "Apache Server" and "Apache Software Foundation" must not be used to 
#    endorse or promote products derived from this software without 
#    prior written permission. For written permission, please contact 
#    apache@apache.org. 
@@ -29,12 +29,13 @@
# 
# 6. Redistributions of any form whatsoever must retain the following 
#    acknowledgment: 
#    "This product includes software developed by the Apache Software Foundatio
#    "This product includes software developed by the Apache Software Foundation 
#    for use in the Apache HTTP server project (http://www.apache.org/)." 
# 
#    for use in the Apache HTTP server project (http://www.apache.org/)."       *
# THIS SOFTWARE IS PROVIDED BY THE Apache Software Foundation ``AS IS'' AND ANY 
# EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR            * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE Apache Software Foundation OR
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 
# PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE Apache Software Foundation OR 
# ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT 
# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
@@ -52,7 +53,6 @@
# For more information on the Apache Software Foundation and the Apache HTTP server 
# project, please see <http://www.apache.org/>. 
# 
#/

# The build environment was provided by Sascha Schumann.
#