diff options
| author | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-25 15:25:00 +0000 |
|---|---|---|
| committer | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-25 15:25:00 +0000 |
| commit | 8c6fb302382183d0d427b9b1c6e03822532a7297 (patch) | |
| tree | a7792923c492fd266cec0ec3800fd2e3cb09007c | |
| parent | 45375adb2b951499922a08910c31447b4929509e (diff) | |
| download | chromium_src-8c6fb302382183d0d427b9b1c6e03822532a7297.zip chromium_src-8c6fb302382183d0d427b9b1c6e03822532a7297.tar.gz chromium_src-8c6fb302382183d0d427b9b1c6e03822532a7297.tar.bz2 | |
Remove conflicting files.
TBR=evanm
Review URL: http://codereview.chromium.org/1305003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42616 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | third_party/lighttpd/LICENSE | 28 | ||||
| -rw-r--r-- | third_party/lighttpd/README.chromium | 5 |
2 files changed, 0 insertions, 33 deletions
diff --git a/third_party/lighttpd/LICENSE b/third_party/lighttpd/LICENSE deleted file mode 100644 index 7464927..0000000 --- a/third_party/lighttpd/LICENSE +++ /dev/null @@ -1,28 +0,0 @@ -Copyright (c) 2004, Jan Kneschke, incremental - All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - -- Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - -- Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - -- Neither the name of the 'incremental' nor the names of its contributors may - be used to endorse or promote products derived from this software without - specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -AND ANY EXPRESS 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 COPYRIGHT OWNER OR CONTRIBUTORS BE -LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF -THE POSSIBILITY OF SUCH DAMAGE. diff --git a/third_party/lighttpd/README.chromium b/third_party/lighttpd/README.chromium deleted file mode 100644 index c6d548d..0000000 --- a/third_party/lighttpd/README.chromium +++ /dev/null @@ -1,5 +0,0 @@ -Name: lighttpd -URL: http://www.lighttpd.net - -lighttpd binaries are only used on Mac and Win; see the READMEs in the -respective directories when you check them out for more info. |