diff options
| author | steveblock@chromium.org <steveblock@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-06 11:01:33 +0000 |
|---|---|---|
| committer | steveblock@chromium.org <steveblock@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-06 11:01:33 +0000 |
| commit | 0c49a4257a624058e75e16d7dda671eaba700516 (patch) | |
| tree | 1e6dbffa8430a65c617f8759b7fcb5996fa30346 /base | |
| parent | 06f644bcddbf9a958b35a5a96b0a807cf843224d (diff) | |
| download | chromium_src-0c49a4257a624058e75e16d7dda671eaba700516.zip chromium_src-0c49a4257a624058e75e16d7dda671eaba700516.tar.gz chromium_src-0c49a4257a624058e75e16d7dda671eaba700516.tar.bz2 | |
Fix license for valgrind
Make the LICENSE file more explicit about the fact that the headers used by Chromium use a BSD license.
BUG=138921
Review URL: https://chromiumcodereview.appspot.com/10843032
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@150082 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
| -rw-r--r-- | base/third_party/valgrind/LICENSE | 14 | ||||
| -rw-r--r-- | base/third_party/valgrind/README.chromium | 1 |
2 files changed, 5 insertions, 10 deletions
diff --git a/base/third_party/valgrind/LICENSE b/base/third_party/valgrind/LICENSE index a45d7c2..41f677b 100644 --- a/base/third_party/valgrind/LICENSE +++ b/base/third_party/valgrind/LICENSE @@ -1,16 +1,10 @@ - ---------------------------------------------------------------- - - Notice that the following BSD-style license applies to this one - file (valgrind.h) only. The rest of Valgrind is licensed under the - terms of the GNU General Public License, version 2, unless - otherwise indicated. See the COPYING file in the source - distribution for details. + Notice that the following BSD-style license applies to the Valgrind header + files used by Chromium (valgrind.h and memcheck.h). However, the rest of + Valgrind is licensed under the terms of the GNU General Public License, + version 2, unless otherwise indicated. ---------------------------------------------------------------- - This file is part of Valgrind, a dynamic binary instrumentation - framework. - Copyright (C) 2000-2008 Julian Seward. All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/base/third_party/valgrind/README.chromium b/base/third_party/valgrind/README.chromium index bfdff39..56a1cbb 100644 --- a/base/third_party/valgrind/README.chromium +++ b/base/third_party/valgrind/README.chromium @@ -1,5 +1,6 @@ Name: valgrind URL: http://valgrind.org +License: BSD Header files in this directory define runtime macros that determine whether the current process is running under Valgrind and tell Memcheck tool about custom |