Title: [171697] branches/safari-600.1-branch/Source/_javascript_Core
- Revision
- 171697
- Author
- matthew_han...@apple.com
- Date
- 2014-07-28 14:48:32 -0700 (Mon, 28 Jul 2014)
Log Message
Merge r171680. <rdar://problem/17834136>
Modified Paths
Diff
Modified: branches/safari-600.1-branch/Source/_javascript_Core/ChangeLog (171696 => 171697)
--- branches/safari-600.1-branch/Source/_javascript_Core/ChangeLog 2014-07-28 21:47:32 UTC (rev 171696)
+++ branches/safari-600.1-branch/Source/_javascript_Core/ChangeLog 2014-07-28 21:48:32 UTC (rev 171697)
@@ -1,3 +1,14 @@
+2014-07-28 Matthew Hanson <matthew_han...@apple.com>
+
+ Merge r171680. <rdar://problem/17834136>
+
+ 2014-07-28 Brent Fulgham <bfulg...@apple.com>
+
+ [Win] Unreviewed build fix.
+
+ * _javascript_Core.vcxproj/_javascript_Core.proj: Switch from the 'Rebuild' target for MSBuild
+ builds to the 'Build' target to avoid a spurious 'clean' in between build steps.
+
2014-07-25 Lucas Forschler <lforsch...@apple.com>
Merge r171578
Modified: branches/safari-600.1-branch/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.proj (171696 => 171697)
--- branches/safari-600.1-branch/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.proj 2014-07-28 21:47:32 UTC (rev 171696)
+++ branches/safari-600.1-branch/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.proj 2014-07-28 21:48:32 UTC (rev 171697)
@@ -60,7 +60,7 @@
<Message Text="Building $(CONFIGURATION) Solution" />
<Error Text="DSTROOT property or environment variable must be defined." Condition="'$(DSTROOT)' == ''" />
<Message Text="Output=$(WebKit_OutputDir)" />
- <MSBuild Projects="@(_javascript_Core)" Properties="Configuration=$(CONFIG)" Targets="ReBuild" />
+ <MSBuild Projects="@(_javascript_Core)" Properties="Configuration=$(CONFIG)" Targets="Build" />
</Target>
<Target Name="PostBuild" AfterTargets="Build">
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
