<!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>[145291] tags/Safari-537.33.2/Source</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/145291">145291</a></dd>
<dt>Author</dt> <dd>lforschler@apple.com</dd>
<dt>Date</dt> <dd>2013-03-08 16:56:05 -0800 (Fri, 08 Mar 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/145247">r145247</a>.  &lt;rdar://problem/13383659&gt;</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#tagsSafari537332SourceJavaScriptCoreChangeLog">tags/Safari-537.33.2/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#tagsSafari537332SourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCoremake">tags/Safari-537.33.2/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.make</a></li>
<li><a href="#tagsSafari537332SourceWTFChangeLog">tags/Safari-537.33.2/Source/WTF/ChangeLog</a></li>
<li><a href="#tagsSafari537332SourceWTFWTFvcxprojWTFmake">tags/Safari-537.33.2/Source/WTF/WTF.vcxproj/WTF.make</a></li>
<li><a href="#tagsSafari537332SourceWebCoreChangeLog">tags/Safari-537.33.2/Source/WebCore/ChangeLog</a></li>
<li><a href="#tagsSafari537332SourceWebCoreWebCorevcxprojWebCoremake">tags/Safari-537.33.2/Source/WebCore/WebCore.vcxproj/WebCore.make</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="tagsSafari537332SourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-537.33.2/Source/JavaScriptCore/ChangeLog (145290 => 145291)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-537.33.2/Source/JavaScriptCore/ChangeLog        2013-03-09 00:53:02 UTC (rev 145290)
+++ tags/Safari-537.33.2/Source/JavaScriptCore/ChangeLog        2013-03-09 00:56:05 UTC (rev 145291)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2013-03-08  Lucas Forschler  &lt;lforschler@apple.com&gt;
+
+        Merge r145247
+
+    2013-03-08  Roger Fong  &lt;roger_fong@apple.com&gt;
+
+            Makefile fixes.
+
+            * JavaScriptCore.vcxproj/JavaScriptCore.make:
+
</ins><span class="cx"> 2013-03-05  Oliver Hunt  &lt;oliver@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Bring back eager resolution of function scoped variables
</span></span></pre></div>
<a id="tagsSafari537332SourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCoremake"></a>
<div class="modfile"><h4>Modified: tags/Safari-537.33.2/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.make (145290 => 145291)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-537.33.2/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.make        2013-03-09 00:53:02 UTC (rev 145290)
+++ tags/Safari-537.33.2/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.make        2013-03-09 00:56:05 UTC (rev 145291)
</span><span class="lines">@@ -10,9 +10,9 @@
</span><span class="cx">         set ConfigurationBuildDir=$(OBJROOT)\$(BUILDSTYLE)
</span><span class="cx">     set WebKit_Source=$(SRCROOT)\..\..
</span><span class="cx">     -mkdir &quot;%ConfigurationBuildDir%\include\private&quot;
</span><del>-    xcopy &quot;%WebKitLibrariesDir%\include\private\*&quot; &quot;%ConfigurationBuildDir%\include\private&quot; /e/v/i/h/y
-    devenv &quot;JavaScriptCoreSubmit.sln&quot; /clean $(BUILDSTYLE)
-    devenv &quot;JavaScriptCoreSubmit.sln&quot; /build $(BUILDSTYLE)
</del><ins>+    xcopy &quot;%WebKit_Libraries%\include\private\*&quot; &quot;%ConfigurationBuildDir%\include\private&quot; /e/v/i/h/y
+    devenv &quot;JavaScriptCore.submit.sln&quot; /clean $(BUILDSTYLE)
+    devenv &quot;JavaScriptCore.submit.sln&quot; /build $(BUILDSTYLE)
</ins><span class="cx">     -xcopy &quot;%ConfigurationBuildDir%\bin\JavaScriptCore.dll&quot; &quot;$(DSTROOT)\AppleInternal\bin\&quot; /e/v/i/h/y
</span><span class="cx">     -xcopy &quot;%ConfigurationBuildDir%\bin\JavaScriptCore_debug.dll&quot; &quot;$(DSTROOT)\AppleInternal\bin\&quot; /e/v/i/h/y
</span><span class="cx">     -xcopy &quot;%ConfigurationBuildDir%\bin\JavaScriptCore.pdb&quot; &quot;$(DSTROOT)\AppleInternal\bin\&quot; /e/v/i/h/y
</span></span></pre></div>
<a id="tagsSafari537332SourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-537.33.2/Source/WTF/ChangeLog (145290 => 145291)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-537.33.2/Source/WTF/ChangeLog        2013-03-09 00:53:02 UTC (rev 145290)
+++ tags/Safari-537.33.2/Source/WTF/ChangeLog        2013-03-09 00:56:05 UTC (rev 145291)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2013-03-08  Lucas Forschler  &lt;lforschler@apple.com&gt;
+
+        Merge r145247
+
+    2013-03-08  Roger Fong  &lt;roger_fong@apple.com&gt;
+
+            Makefile fixes.
+
+            * WTF.vcxproj/WTF.make:
+
</ins><span class="cx"> 2013-03-06  Adenilson Cavalcanti  &lt;cavalcantii@gmail.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Build fix: PageAllocationAligned no longer has executable flag
</span></span></pre></div>
<a id="tagsSafari537332SourceWTFWTFvcxprojWTFmake"></a>
<div class="modfile"><h4>Modified: tags/Safari-537.33.2/Source/WTF/WTF.vcxproj/WTF.make (145290 => 145291)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-537.33.2/Source/WTF/WTF.vcxproj/WTF.make        2013-03-09 00:53:02 UTC (rev 145290)
+++ tags/Safari-537.33.2/Source/WTF/WTF.vcxproj/WTF.make        2013-03-09 00:56:05 UTC (rev 145291)
</span><span class="lines">@@ -9,7 +9,7 @@
</span><span class="cx">         set WebKit_OutputDir=$(OBJROOT)
</span><span class="cx">     set WebKit_Source=$(SRCROOT)\..\..
</span><span class="cx">         set ConfigurationBuildDir=$(OBJROOT)\$(BUILDSTYLE)
</span><del>-    devenv &quot;WTF.sln&quot; /clean $(BUILDSTYLE)
-    devenv &quot;WTF.sln&quot; /build $(BUILDSTYLE)
</del><ins>+    devenv &quot;WTF.submit.sln&quot; /clean $(BUILDSTYLE)
+    devenv &quot;WTF.submit.sln&quot; /build $(BUILDSTYLE)
</ins><span class="cx">     xcopy &quot;%ConfigurationBuildDir%\include\*&quot; &quot;$(DSTROOT)\AppleInternal\include\&quot; /e/v/i/h/y    
</span><span class="cx">     xcopy &quot;%ConfigurationBuildDir%\lib\*&quot; &quot;$(DSTROOT)\AppleInternal\lib\&quot; /e/v/i/h/y    
</span></span></pre></div>
<a id="tagsSafari537332SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-537.33.2/Source/WebCore/ChangeLog (145290 => 145291)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-537.33.2/Source/WebCore/ChangeLog        2013-03-09 00:53:02 UTC (rev 145290)
+++ tags/Safari-537.33.2/Source/WebCore/ChangeLog        2013-03-09 00:56:05 UTC (rev 145291)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2013-03-08  Lucas Forschler  &lt;lforschler@apple.com&gt;
+
+        Merge r145247
+
+    2013-03-08  Roger Fong  &lt;roger_fong@apple.com&gt;
+
+            Makefile fixes.
+
+            * WebCore.vcxproj/WebCore.make:
+
</ins><span class="cx"> 2013-03-06  Julien Chaffraix  &lt;jchaffraix@webkit.org&gt;
</span><span class="cx"> 
</span><span class="cx">         [CSS Grid Layout] Extend our grammar to support 2 positions for grid-{row|column}
</span></span></pre></div>
<a id="tagsSafari537332SourceWebCoreWebCorevcxprojWebCoremake"></a>
<div class="modfile"><h4>Modified: tags/Safari-537.33.2/Source/WebCore/WebCore.vcxproj/WebCore.make (145290 => 145291)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-537.33.2/Source/WebCore/WebCore.vcxproj/WebCore.make        2013-03-09 00:53:02 UTC (rev 145290)
+++ tags/Safari-537.33.2/Source/WebCore/WebCore.vcxproj/WebCore.make        2013-03-09 00:56:05 UTC (rev 145291)
</span><span class="lines">@@ -11,7 +11,7 @@
</span><span class="cx">         set ConfigurationBuildDir=$(OBJROOT)\$(BUILDSTYLE)
</span><span class="cx">     set WebKit_Source=$(SRCROOT)\..\..
</span><span class="cx">         -mkdir 2&gt;NUL &quot;%ConfigurationBuildDir%\include\private&quot;
</span><del>-        xcopy &quot;%WebKitLibrariesDir%\include\private\*&quot; &quot;%ConfigurationBuildDir%\include\private&quot; /e/v/i/h/y
</del><ins>+        xcopy &quot;%WebKit_Libraries%\include\private\*&quot; &quot;%ConfigurationBuildDir%\include\private&quot; /e/v/i/h/y
</ins><span class="cx">         devenv &quot;WebCore.submit.sln&quot; /rebuild $(BUILDSTYLE)
</span><span class="cx">         xcopy &quot;%ConfigurationBuildDir%\include\*&quot; &quot;$(DSTROOT)\AppleInternal\include\&quot; /e/v/i/h/y        
</span><span class="cx">         xcopy &quot;%ConfigurationBuildDir%\lib\*&quot; &quot;$(DSTROOT)\AppleInternal\lib\&quot; /e/v/i/h/y        
</span></span></pre>
</div>
</div>

</body>
</html>