Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(79)

Unified Diff: src/third_party/valgrind/LICENSE

Issue 1183743003: Updates to the license information of third party components. (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: Reworded naming regarding sub dirs Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « LICENSE ('k') | src/third_party/vtune/LICENSE » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/third_party/valgrind/LICENSE
diff --git a/LICENSE.valgrind b/src/third_party/valgrind/LICENSE
similarity index 76%
copy from LICENSE.valgrind
copy to src/third_party/valgrind/LICENSE
index fd8ebaf50992130504530eb002daad634f3125e8..0be0037ca2e9a4e5e46c48703b0c05a39a11c985 100644
--- a/LICENSE.valgrind
+++ b/src/third_party/valgrind/LICENSE
@@ -11,7 +11,7 @@ distribution for details.
This file is part of Valgrind, a dynamic binary instrumentation
framework.
-Copyright (C) 2000-2007 Julian Seward. All rights reserved.
+Copyright (C) 2000-2010 Julian Seward. All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
@@ -20,16 +20,16 @@ are met:
1. Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
-2. The origin of this software must not be misrepresented; you must
- not claim that you wrote the original software. If you use this
- software in a product, an acknowledgment in the product
+2. The origin of this software must not be misrepresented; you must
+ not claim that you wrote the original software. If you use this
+ software in a product, an acknowledgment in the product
documentation would be appreciated but is not required.
3. Altered source versions must be plainly marked as such, and must
not be misrepresented as being the original software.
-4. The name of the author may not be used to endorse or promote
- products derived from this software without specific prior written
+4. The name of the author may not be used to endorse or promote
+ products derived from this software without specific prior written
permission.
THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
@@ -43,3 +43,12 @@ 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.
+
+----------------------------------------------------------------
+
+Notice that the above BSD-style license applies to this one file
+(valgrind.h) only. The entire rest of Valgrind is licensed under
+the terms of the GNU General Public License, version 2. See the
+COPYING file in the source distribution for details.
+
+----------------------------------------------------------------
« no previous file with comments | « LICENSE ('k') | src/third_party/vtune/LICENSE » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698