diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-19 17:58:10 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-19 17:58:10 +0000 |
| commit | 3de2b0deb44020852a096946bd6a7c1d6033442c (patch) | |
| tree | 82cb1bcdbcb1145e0d19ea95cff6bd3deccc8d4d /third_party | |
| parent | b121b1261952cf3490c3c79dad6a8d2262765101 (diff) | |
| download | chromium_src-3de2b0deb44020852a096946bd6a7c1d6033442c.zip chromium_src-3de2b0deb44020852a096946bd6a7c1d6033442c.tar.gz chromium_src-3de2b0deb44020852a096946bd6a7c1d6033442c.tar.bz2 | |
Update the credits file, fix two READMEs that were broken, change the encoding of Ms-PL to UTF-8 so that the resulting credits file is well-formed, and update licenses.pl for duplicates.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/3799011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63072 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/safe_browsing/README.chromium | 10 | ||||
| -rw-r--r-- | third_party/wtl/Ms-PL.txt | 4 |
2 files changed, 8 insertions, 6 deletions
diff --git a/third_party/safe_browsing/README.chromium b/third_party/safe_browsing/README.chromium index 81d472e..da27ff8 100644 --- a/third_party/safe_browsing/README.chromium +++ b/third_party/safe_browsing/README.chromium @@ -1,8 +1,10 @@ -Name: Google Cache Invalidation API -URL: http://code.google.com/p/google-safe-browsing/
+Name: Google Safe Browsing +URL: http://code.google.com/p/google-safe-browsing/ + License: Apache 2.0 License File: testing/LICENSE Description: -This is the safebrowsing testing server that could be used to
-verify the safebrowsing logic in chrome (and other browsers).
+This is the safebrowsing testing server that could be used to +verify the safebrowsing logic in chrome (and other browsers). + diff --git a/third_party/wtl/Ms-PL.txt b/third_party/wtl/Ms-PL.txt index 5414a06..9ccddb2 100644 --- a/third_party/wtl/Ms-PL.txt +++ b/third_party/wtl/Ms-PL.txt @@ -18,7 +18,7 @@ software. A "contributor" is any person that distributes its contribution under this license. -"Licensed patents" are a contributor’s patent claims that read directly on its +"Licensed patents" are a contributor’s patent claims that read directly on its contribution. @@ -41,7 +41,7 @@ software. 3. Conditions and Limitations (A) No Trademark License- This license does not grant you rights to use any -contributors’ name, logo, or trademarks. +contributors’ name, logo, or trademarks. (B) If you bring a patent claim against any contributor over patents that you claim are infringed by the software, your patent license from such contributor |