<!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>[162526] branches/safari-537.75-branch/WebKitLibraries</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/162526">162526</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2014-01-22 09:38:26 -0800 (Wed, 22 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/154534">r154534</a>
2013-08-23 Brent Fulgham <bfulgham@apple.com>
[Windows] Unreviewed build correction.
* win/lib32/WebKitSystemInterface.lib: Update with new API for <a href="http://trac.webkit.org/projects/webkit/changeset/132545">r132545</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari53775branchWebKitLibrariesChangeLog">branches/safari-537.75-branch/WebKitLibraries/ChangeLog</a></li>
<li><a href="#branchessafari53775branchWebKitLibrarieswinlib32WebKitSystemInterfacelib">branches/safari-537.75-branch/WebKitLibraries/win/lib32/WebKitSystemInterface.lib</a></li>
<li><a href="#branchessafari53775branchWebKitLibrarieswintoolsvspropscommonprops">branches/safari-537.75-branch/WebKitLibraries/win/tools/vsprops/common.props</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#branchessafari53775branchWebKitLibrariesChangeLog">branches/safari-537.75-branch/WebKitLibraries/ChangeLog</a></li>
<li><a href="#branchessafari53775branchWebKitLibrarieswinlib32WebKitSystemInterfacelib">branches/safari-537.75-branch/WebKitLibraries/win/lib32/WebKitSystemInterface.lib</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari53775branchWebKitLibrariesChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-537.75-branch/WebKitLibraries/ChangeLog (162525 => 162526)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.75-branch/WebKitLibraries/ChangeLog 2014-01-22 17:35:56 UTC (rev 162525)
+++ branches/safari-537.75-branch/WebKitLibraries/ChangeLog 2014-01-22 17:38:26 UTC (rev 162526)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-01-22 Brent Fulgham <bfulgham@apple.com>
+
+ Merge r154534
+
+ 2013-08-23 Brent Fulgham <bfulgham@apple.com>
+
+ [Windows] Unreviewed build correction.
+
+ * win/lib32/WebKitSystemInterface.lib: Update with new API for r132545.
+
</ins><span class="cx"> 2013-12-23 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge 161003: <rdar://problem/15719584>
</span><span class="cx">Property changes on: branches/safari-537.75-branch/WebKitLibraries/ChangeLog
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnmergeinfo"></a>
<div class="addfile"><h4>Added: svn:mergeinfo</h4></div>
<a id="branchessafari53775branchWebKitLibrarieswinlib32WebKitSystemInterfacelib"></a>
<div class="binary"><h4>Modified: branches/safari-537.75-branch/WebKitLibraries/win/lib32/WebKitSystemInterface.lib</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<span class="cx">Property changes on: branches/safari-537.75-branch/WebKitLibraries/win/lib32/WebKitSystemInterface.lib
</span><span class="cx">___________________________________________________________________
</span><a id="svnmergeinfo"></a>
<div class="addfile"><h4>Added: svn:mergeinfo</h4></div>
<a id="branchessafari53775branchWebKitLibrarieswintoolsvspropscommonprops"></a>
<div class="modfile"><h4>Modified: branches/safari-537.75-branch/WebKitLibraries/win/tools/vsprops/common.props (162525 => 162526)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.75-branch/WebKitLibraries/win/tools/vsprops/common.props 2014-01-22 17:35:56 UTC (rev 162525)
+++ branches/safari-537.75-branch/WebKitLibraries/win/tools/vsprops/common.props 2014-01-22 17:38:26 UTC (rev 162526)
</span><span class="lines">@@ -12,9 +12,11 @@
</span><span class="cx"> <LinkIncremental>false</LinkIncremental>
</span><span class="cx"> <NMakeBuildCommandLine>%SystemDrive%\cygwin\bin\which.exe bash
</span><span class="cx"> if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
</span><ins>+set PLATFORMARCHITECTURE=$(PlatformArchitecture)
</ins><span class="cx"> nmake /nologo -f $(ProjectName).make</NMakeBuildCommandLine>
</span><span class="cx"> <NMakeReBuildCommandLine>%SystemDrive%\cygwin\bin\which.exe bash
</span><span class="cx"> if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
</span><ins>+set PLATFORMARCHITECTURE=$(PlatformArchitecture)
</ins><span class="cx"> nmake /nologo -f $(ProjectName).make clean
</span><span class="cx"> nmake /nologo -f $(ProjectName).make</NMakeReBuildCommandLine>
</span><span class="cx"> <NMakeCleanCommandLine>%SystemDrive%\cygwin\bin\which.exe bash
</span><span class="lines">@@ -39,7 +41,7 @@
</span><span class="cx"> <WarningLevel>Level4</WarningLevel>
</span><span class="cx"> <TreatWarningAsError>false</TreatWarningAsError>
</span><span class="cx"> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</span><del>- <DisableSpecificWarnings>4018;4068;4099;4100;4127;4138;4146;4180;4189;4201;4244;4251;4267;4275;4288;4291;4305;4344;4355;4389;4396;4481;4503;4505;4510;4512;4610;4706;4800;4819;4951;4952;4996;6011;6031;6211;6246;6255;6387;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</del><ins>+ <DisableSpecificWarnings>4018;4068;4099;4100;4127;4138;4146;4180;4189;4201;4244;4251;4267;4275;4288;4291;4305;4344;4355;4389;4396;4481;4503;4505;4510;4512;4530;4610;4702;4706;4800;4819;4951;4952;4996;6011;6031;6211;6246;6255;6387;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ins><span class="cx"> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
</span><span class="cx"> <FunctionLevelLinking>false</FunctionLevelLinking>
</span><span class="cx"> <FloatingPointExceptions>false</FloatingPointExceptions>
</span></span></pre>
</div>
</div>
</body>
</html>