| Index: third_party/libvpx/source/libvpx/LICENSE
|
| diff --git a/third_party/launchpad_translations/LICENSE b/third_party/libvpx/source/libvpx/LICENSE
|
| similarity index 67%
|
| copy from third_party/launchpad_translations/LICENSE
|
| copy to third_party/libvpx/source/libvpx/LICENSE
|
| index 670784806515ad45042919307aff90ed08c658fa..1ce44343c4a325e9e1189fd98bb44a9f2f096da9 100644
|
| --- a/third_party/launchpad_translations/LICENSE
|
| +++ b/third_party/libvpx/source/libvpx/LICENSE
|
| @@ -1,3 +1,5 @@
|
| +Copyright (c) 2010, The WebM Project authors. All rights reserved.
|
| +
|
| Redistribution and use in source and binary forms, with or without
|
| modification, are permitted provided that the following conditions are
|
| met:
|
| @@ -5,14 +7,15 @@ 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.
|
| + * 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 copyright holders nor the names of its
|
| - contributors may be used to endorse or promote products derived
|
| - from this software without specific prior written permission.
|
| + * Neither the name of Google, nor the WebM Project, 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
|
| @@ -25,3 +28,4 @@ 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.
|
| +
|
|
|