diff options
| author | steveblock@chromium.org <steveblock@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-26 18:03:38 +0000 |
|---|---|---|
| committer | steveblock@chromium.org <steveblock@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-26 18:03:38 +0000 |
| commit | 9565f7a84e784587238f333a1f0036538e81b5c0 (patch) | |
| tree | b4e5a514a5dd548f168be7f92c03e27f8291501e /breakpad | |
| parent | 4dd01a042091f1a57f9419824382121e4e7c8a49 (diff) | |
| download | chromium_src-9565f7a84e784587238f333a1f0036538e81b5c0.zip chromium_src-9565f7a84e784587238f333a1f0036538e81b5c0.tar.gz chromium_src-9565f7a84e784587238f333a1f0036538e81b5c0.tar.bz2 | |
Update LICENSE file for breakpad
Breakpad mostly uses a new BSD license, plus an MIT/X derivate for libcurl.
However, a couple of files use different licenses. This change updates the
LICENSE file to reflect this.
- src/client/mac/handler/breakpad_nlist_64.cc - Apple PSL 2.0
- src/common/mac/testing/GTMSenTestCase.h - ASL v2
Review URL: http://codereview.chromium.org/9856015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@128950 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'breakpad')
| -rw-r--r-- | breakpad/LICENSE | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/breakpad/LICENSE b/breakpad/LICENSE index 532c92c..2a66be3 100644 --- a/breakpad/LICENSE +++ b/breakpad/LICENSE @@ -49,3 +49,40 @@ OR OTHER DEALINGS IN THE SOFTWARE. Except as contained in this notice, the name of a copyright holder shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization of the copyright holder. + + +Copyright (c) 1999 Apple Computer, Inc. All rights reserved. + +@APPLE_LICENSE_HEADER_START@ + +This file contains Original Code and/or Modifications of Original Code +as defined in and that are subject to the Apple Public Source License +Version 2.0 (the 'License'). You may not use this file except in +compliance with the License. Please obtain a copy of the License at +http://www.opensource.apple.com/apsl/ and read it before using this +file. + +The Original Code and all software distributed under the License are +distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER +EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES, +INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT. +Please see the License for the specific language governing rights and +limitations under the License. + +@APPLE_LICENSE_HEADER_END@ + + +Copyright 2007-2008 Google Inc. + +Licensed under the Apache License, Version 2.0 (the "License"); you may not +use this file except in compliance with the License. You may obtain a copy +of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +License for the specific language governing permissions and limitations under +the License. |