Title: [171699] tags/Safari-600.1.2.3/Source/_javascript_Core
- Revision
- 171699
- Author
- [email protected]
- Date
- 2014-07-28 14:55:57 -0700 (Mon, 28 Jul 2014)
Log Message
Merge r171680. <rdar://problem/17830040>
Modified Paths
Diff
Modified: tags/Safari-600.1.2.3/Source/_javascript_Core/ChangeLog (171698 => 171699)
--- tags/Safari-600.1.2.3/Source/_javascript_Core/ChangeLog 2014-07-28 21:50:47 UTC (rev 171698)
+++ tags/Safari-600.1.2.3/Source/_javascript_Core/ChangeLog 2014-07-28 21:55:57 UTC (rev 171699)
@@ -1,3 +1,14 @@
+2014-07-28 Matthew Hanson <[email protected]>
+
+ Merge r171680. <rdar://problem/17830040>
+
+ 2014-07-28 Brent Fulgham <[email protected]>
+
+ [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 <[email protected]>
Merge r171578
Modified: tags/Safari-600.1.2.3/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.proj (171698 => 171699)
--- tags/Safari-600.1.2.3/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.proj 2014-07-28 21:50:47 UTC (rev 171698)
+++ tags/Safari-600.1.2.3/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.proj 2014-07-28 21:55:57 UTC (rev 171699)
@@ -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
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
