diff options
| author | Andras Becsi <andras.becsi@digia.com> | 2014-03-18 13:16:26 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-03-20 15:55:39 +0100 |
| commit | 3f0f86b0caed75241fa71c95a5d73bc0164348c5 (patch) | |
| tree | 92b9fb00f2e9e90b0be2262093876d4f43b6cd13 /chromium/third_party/win_toolchain | |
| parent | e90d7c4b152c56919d963987e2503f9909a666d2 (diff) | |
| download | qtwebengine-chromium-3f0f86b0caed75241fa71c95a5d73bc0164348c5.tar.gz | |
Update to new stable branch 1750
This also includes an updated ninja and chromium dependencies
needed on Windows.
Change-Id: Icd597d80ed3fa4425933c9f1334c3c2e31291c42
Reviewed-by: Zoltan Arvai <zarvai@inf.u-szeged.hu>
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Diffstat (limited to 'chromium/third_party/win_toolchain')
| -rw-r--r-- | chromium/third_party/win_toolchain/LICENSE | 27 | ||||
| -rw-r--r-- | chromium/third_party/win_toolchain/README.chromium | 6 | ||||
| -rw-r--r-- | chromium/third_party/win_toolchain/toolchain.sha1 | 1 |
3 files changed, 34 insertions, 0 deletions
diff --git a/chromium/third_party/win_toolchain/LICENSE b/chromium/third_party/win_toolchain/LICENSE new file mode 100644 index 00000000000..3d0f7d3edfd --- /dev/null +++ b/chromium/third_party/win_toolchain/LICENSE @@ -0,0 +1,27 @@ +// Copyright (c) 2013 The Chromium 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 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. +// * Neither the name of Google Inc. 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, +// 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. diff --git a/chromium/third_party/win_toolchain/README.chromium b/chromium/third_party/win_toolchain/README.chromium new file mode 100644 index 00000000000..71b86b64831 --- /dev/null +++ b/chromium/third_party/win_toolchain/README.chromium @@ -0,0 +1,6 @@ +Name: SHA1 for Windows toolchain that is built from external sources. +Short Name: win_toolchain +URL: http://msdn.microsoft.com/ +License: BSD 3-Clause License +License File: LICENSE +Security Critical: yes diff --git a/chromium/third_party/win_toolchain/toolchain.sha1 b/chromium/third_party/win_toolchain/toolchain.sha1 new file mode 100644 index 00000000000..a7b4cdfb782 --- /dev/null +++ b/chromium/third_party/win_toolchain/toolchain.sha1 @@ -0,0 +1 @@ +1b78fa680523f420bbfb75371ea76959eabafffa |