| Index: ios/third_party/blink/LICENSE
|
| diff --git a/content/shell/resources/README.txt b/ios/third_party/blink/LICENSE
|
| similarity index 69%
|
| copy from content/shell/resources/README.txt
|
| copy to ios/third_party/blink/LICENSE
|
| index 4a4e10bce33df1038ca810093d93919a37948ad5..cc3ab9741e69ca2471daff0470fdd99c7e69a42a 100644
|
| --- a/content/shell/resources/README.txt
|
| +++ b/ios/third_party/blink/LICENSE
|
| @@ -1,8 +1,7 @@
|
| -missingImage.gif was created from Webkit data: WebCore/Resources/missingImage.tiff
|
| +Copyright (C) 2008 Apple Inc. All Rights Reserved.
|
| +Copyright (C) 2009 Torch Mobile, Inc. http://www.torchmobile.com/
|
| +Copyright (C) 2010 Google, Inc. All Rights Reserved.
|
|
|
| -Licence text for missingImage.tiff from which missingImage.gif was generated:
|
| -
|
| -Copyright (C) 2003, 2004, 2005, 2006 Apple Computer, Inc. All rights reserved.
|
| Redistribution and use in source and binary forms, with or without
|
| modification, are permitted provided that the following conditions
|
| are met:
|
| @@ -11,10 +10,11 @@ are met:
|
| 2. 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.
|
| -THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
|
| + *
|
| +THIS SOFTWARE IS PROVIDED BY APPLE INC. ``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 APPLE COMPUTER, INC. OR
|
| +PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. 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
|
| @@ -22,5 +22,3 @@ 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.
|
| -
|
| -missingImage.png is the same as WebCore/Resources/missingImage.png and carries exactly the same license.
|
|
|