<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[198327] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/198327">198327</a></dd>
<dt>Author</dt> <dd>ossy@webkit.org</dd>
<dt>Date</dt> <dd>2016-03-17 05:28:42 -0700 (Thu, 17 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, line ending fixes.
Source/ThirdParty:
* gtest/codegear/gtest_all.cc:
* gtest/codegear/gtest_link.cc:
LayoutTests:
* css2.1/20110323/support/at-import-001.css:
* css2.1/20110323/support/at-import-002.css:
* css2.1/20110323/support/at-import-004.css:
* css2.1/20110323/support/at-import-005.css:
* css2.1/20110323/support/at-import-006.css:
* css2.1/20110323/support/at-import-007.css:
* css2.1/20110323/support/eof-green.css:
* storage/indexeddb/set_version_blocked.html:
* storage/indexeddb/transaction-read-only.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestscss2120110323supportatimport001css">trunk/LayoutTests/css2.1/20110323/support/at-import-001.css</a></li>
<li><a href="#trunkLayoutTestscss2120110323supportatimport002css">trunk/LayoutTests/css2.1/20110323/support/at-import-002.css</a></li>
<li><a href="#trunkLayoutTestscss2120110323supportatimport004css">trunk/LayoutTests/css2.1/20110323/support/at-import-004.css</a></li>
<li><a href="#trunkLayoutTestscss2120110323supportatimport005css">trunk/LayoutTests/css2.1/20110323/support/at-import-005.css</a></li>
<li><a href="#trunkLayoutTestscss2120110323supportatimport006css">trunk/LayoutTests/css2.1/20110323/support/at-import-006.css</a></li>
<li><a href="#trunkLayoutTestscss2120110323supportatimport007css">trunk/LayoutTests/css2.1/20110323/support/at-import-007.css</a></li>
<li><a href="#trunkLayoutTestscss2120110323supporteofgreencss">trunk/LayoutTests/css2.1/20110323/support/eof-green.css</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbset_version_blockedhtml">trunk/LayoutTests/storage/indexeddb/set_version_blocked.html</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbtransactionreadonlyhtml">trunk/LayoutTests/storage/indexeddb/transaction-read-only.html</a></li>
<li><a href="#trunkSourceThirdPartyChangeLog">trunk/Source/ThirdParty/ChangeLog</a></li>
<li><a href="#trunkSourceThirdPartygtestcodegeargtest_allcc">trunk/Source/ThirdParty/gtest/codegear/gtest_all.cc</a></li>
<li><a href="#trunkSourceThirdPartygtestcodegeargtest_linkcc">trunk/Source/ThirdParty/gtest/codegear/gtest_link.cc</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (198326 => 198327)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-03-17 11:25:10 UTC (rev 198326)
+++ trunk/LayoutTests/ChangeLog 2016-03-17 12:28:42 UTC (rev 198327)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-03-17 Csaba Osztrogonác <ossy@webkit.org>
+
+ Unreviewed, line ending fixes.
+
+ * css2.1/20110323/support/at-import-001.css:
+ * css2.1/20110323/support/at-import-002.css:
+ * css2.1/20110323/support/at-import-004.css:
+ * css2.1/20110323/support/at-import-005.css:
+ * css2.1/20110323/support/at-import-006.css:
+ * css2.1/20110323/support/at-import-007.css:
+ * css2.1/20110323/support/eof-green.css:
+ * storage/indexeddb/set_version_blocked.html:
+ * storage/indexeddb/transaction-read-only.html:
+
</ins><span class="cx"> 2016-03-17 Youenn Fablet <youenn.fablet@crf.canon.fr>
</span><span class="cx">
</span><span class="cx"> [Fetch API] response-consume.html is crashing on Mac WK1 Debug builds
</span></span></pre></div>
<a id="trunkLayoutTestscss2120110323supportatimport001css"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/css2.1/20110323/support/at-import-001.css (198326 => 198327)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css2.1/20110323/support/at-import-001.css 2016-03-17 11:25:10 UTC (rev 198326)
+++ trunk/LayoutTests/css2.1/20110323/support/at-import-001.css 2016-03-17 12:28:42 UTC (rev 198327)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-div
-{
- color: red;
</del><ins>+div
+{
+ color: red;
</ins><span class="cx"> }
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestscss2120110323supportatimport002css"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/css2.1/20110323/support/at-import-002.css (198326 => 198327)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css2.1/20110323/support/at-import-002.css 2016-03-17 11:25:10 UTC (rev 198326)
+++ trunk/LayoutTests/css2.1/20110323/support/at-import-002.css 2016-03-17 12:28:42 UTC (rev 198327)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-div
-{
- color: green;
</del><ins>+div
+{
+ color: green;
</ins><span class="cx"> }
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestscss2120110323supportatimport004css"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/css2.1/20110323/support/at-import-004.css (198326 => 198327)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css2.1/20110323/support/at-import-004.css 2016-03-17 11:25:10 UTC (rev 198326)
+++ trunk/LayoutTests/css2.1/20110323/support/at-import-004.css 2016-03-17 12:28:42 UTC (rev 198327)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-div
-{
- color: red;
</del><ins>+div
+{
+ color: red;
</ins><span class="cx"> }
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestscss2120110323supportatimport005css"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/css2.1/20110323/support/at-import-005.css (198326 => 198327)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css2.1/20110323/support/at-import-005.css 2016-03-17 11:25:10 UTC (rev 198326)
+++ trunk/LayoutTests/css2.1/20110323/support/at-import-005.css 2016-03-17 12:28:42 UTC (rev 198327)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-div
-{
- color: green;
</del><ins>+div
+{
+ color: green;
</ins><span class="cx"> }
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestscss2120110323supportatimport006css"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/css2.1/20110323/support/at-import-006.css (198326 => 198327)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css2.1/20110323/support/at-import-006.css 2016-03-17 11:25:10 UTC (rev 198326)
+++ trunk/LayoutTests/css2.1/20110323/support/at-import-006.css 2016-03-17 12:28:42 UTC (rev 198327)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-div
-{
- color: green;
</del><ins>+div
+{
+ color: green;
</ins><span class="cx"> }
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestscss2120110323supportatimport007css"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/css2.1/20110323/support/at-import-007.css (198326 => 198327)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css2.1/20110323/support/at-import-007.css 2016-03-17 11:25:10 UTC (rev 198326)
+++ trunk/LayoutTests/css2.1/20110323/support/at-import-007.css 2016-03-17 12:28:42 UTC (rev 198327)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-div
-{
- color: green;
</del><ins>+div
+{
+ color: green;
</ins><span class="cx"> }
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestscss2120110323supporteofgreencss"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/css2.1/20110323/support/eof-green.css (198326 => 198327)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css2.1/20110323/support/eof-green.css 2016-03-17 11:25:10 UTC (rev 198326)
+++ trunk/LayoutTests/css2.1/20110323/support/eof-green.css 2016-03-17 12:28:42 UTC (rev 198327)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><del>-/* eof-green.css */
-div
-{
- color: green;
</del><ins>+/* eof-green.css */
+div
+{
+ color: green;
</ins><span class="cx"> }
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbset_version_blockedhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/set_version_blocked.html (198326 => 198327)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/set_version_blocked.html 2016-03-17 11:25:10 UTC (rev 198326)
+++ trunk/LayoutTests/storage/indexeddb/set_version_blocked.html 2016-03-17 12:28:42 UTC (rev 198327)
</span><span class="lines">@@ -1,9 +1,9 @@
</span><del>-<html>
-<head>
-<script src="../../resources/js-test.js"></script>
-<script src="resources/shared.js"></script>
-</head>
-<body>
-<script src="resources/set_version_blocked.js"></script>
-</body>
-</html>
</del><ins>+<html>
+<head>
+<script src="../../resources/js-test.js"></script>
+<script src="resources/shared.js"></script>
+</head>
+<body>
+<script src="resources/set_version_blocked.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbtransactionreadonlyhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/transaction-read-only.html (198326 => 198327)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/transaction-read-only.html 2016-03-17 11:25:10 UTC (rev 198326)
+++ trunk/LayoutTests/storage/indexeddb/transaction-read-only.html 2016-03-17 12:28:42 UTC (rev 198327)
</span><span class="lines">@@ -1,9 +1,9 @@
</span><del>-<html>
-<head>
-<script src="../../resources/js-test.js"></script>
-<script src="resources/shared.js"></script>
-</head>
-<body>
-<script src="resources/transaction-read-only.js"></script>
-</body>
-</html>
</del><ins>+<html>
+<head>
+<script src="../../resources/js-test.js"></script>
+<script src="resources/shared.js"></script>
+</head>
+<body>
+<script src="resources/transaction-read-only.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceThirdPartyChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/ChangeLog (198326 => 198327)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/ChangeLog 2016-03-17 11:25:10 UTC (rev 198326)
+++ trunk/Source/ThirdParty/ChangeLog 2016-03-17 12:28:42 UTC (rev 198327)
</span><span class="lines">@@ -1,3 +1,10 @@
</span><ins>+2016-03-17 Csaba Osztrogonác <ossy@webkit.org>
+
+ Unreviewed, line ending fixes.
+
+ * gtest/codegear/gtest_all.cc:
+ * gtest/codegear/gtest_link.cc:
+
</ins><span class="cx"> 2016-03-10 Frederic Wang <fwang@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Add support for WOFF2
</span></span></pre></div>
<a id="trunkSourceThirdPartygtestcodegeargtest_allcc"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/gtest/codegear/gtest_all.cc (198326 => 198327)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/gtest/codegear/gtest_all.cc 2016-03-17 11:25:10 UTC (rev 198326)
+++ trunk/Source/ThirdParty/gtest/codegear/gtest_all.cc 2016-03-17 12:28:42 UTC (rev 198327)
</span><span class="lines">@@ -1,38 +1,38 @@
</span><del>-// Copyright 2009, Google Inc.
-// 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.
-//
-// Author: Josh Kelley (joshkel@gmail.com)
-//
-// Google C++ Testing Framework (Google Test)
-//
-// C++Builder's IDE cannot build a static library from files with hyphens
-// in their name. See http://qc.codegear.com/wc/qcmain.aspx?d=70977 .
-// This file serves as a workaround.
-
-#include "src/gtest-all.cc"
</del><ins>+// Copyright 2009, Google Inc.
+// 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.
+//
+// Author: Josh Kelley (joshkel@gmail.com)
+//
+// Google C++ Testing Framework (Google Test)
+//
+// C++Builder's IDE cannot build a static library from files with hyphens
+// in their name. See http://qc.codegear.com/wc/qcmain.aspx?d=70977 .
+// This file serves as a workaround.
+
+#include "src/gtest-all.cc"
</ins></span></pre></div>
<a id="trunkSourceThirdPartygtestcodegeargtest_linkcc"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/gtest/codegear/gtest_link.cc (198326 => 198327)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/gtest/codegear/gtest_link.cc 2016-03-17 11:25:10 UTC (rev 198326)
+++ trunk/Source/ThirdParty/gtest/codegear/gtest_link.cc 2016-03-17 12:28:42 UTC (rev 198327)
</span><span class="lines">@@ -1,40 +1,40 @@
</span><del>-// Copyright 2009, Google Inc.
-// 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.
-//
-// Author: Josh Kelley (joshkel@gmail.com)
-//
-// Google C++ Testing Framework (Google Test)
-//
-// Links gtest.lib and gtest_main.lib into the current project in C++Builder.
-// This means that these libraries can't be renamed, but it's the only way to
-// ensure that Debug versus Release test builds are linked against the
-// appropriate Debug or Release build of the libraries.
-
-#pragma link "gtest.lib"
-#pragma link "gtest_main.lib"
</del><ins>+// Copyright 2009, Google Inc.
+// 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.
+//
+// Author: Josh Kelley (joshkel@gmail.com)
+//
+// Google C++ Testing Framework (Google Test)
+//
+// Links gtest.lib and gtest_main.lib into the current project in C++Builder.
+// This means that these libraries can't be renamed, but it's the only way to
+// ensure that Debug versus Release test builds are linked against the
+// appropriate Debug or Release build of the libraries.
+
+#pragma link "gtest.lib"
+#pragma link "gtest_main.lib"
</ins></span></pre>
</div>
</div>
</body>
</html>