Index: third_party/libvpx_new/LICENSE |
diff --git a/third_party/WebKit/LayoutTests/imported/web-platform-tests/resources/LICENSE b/third_party/libvpx_new/LICENSE |
similarity index 54% |
copy from third_party/WebKit/LayoutTests/imported/web-platform-tests/resources/LICENSE |
copy to third_party/libvpx_new/LICENSE |
index 45896e6be2bd51f4b78e9703caefb9b672e10a55..1ce44343c4a325e9e1189fd98bb44a9f2f096da9 100644 |
--- a/third_party/WebKit/LayoutTests/imported/web-platform-tests/resources/LICENSE |
+++ b/third_party/libvpx_new/LICENSE |
@@ -1,30 +1,31 @@ |
-W3C 3-clause BSD License |
- |
-http://www.w3.org/Consortium/Legal/2008/03-bsd-license.html |
+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: |
-* Redistributions of works must retain the original copyright notice, |
- this list of conditions and the following disclaimer. |
+ * 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 original 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 W3C nor the names of its contributors may be |
- used to endorse or promote products derived from this work 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 |
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, |
+HOLDER 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. |
+ |