Title: [190500] branches/safari-601-branch/Source/_javascript_Core
- Revision
- 190500
- Author
- [email protected]
- Date
- 2015-10-02 06:57:48 -0700 (Fri, 02 Oct 2015)
Log Message
Merge r189460. rdar://problem/22802036
Modified Paths
Diff
Modified: branches/safari-601-branch/Source/_javascript_Core/ChangeLog (190499 => 190500)
--- branches/safari-601-branch/Source/_javascript_Core/ChangeLog 2015-10-02 13:57:41 UTC (rev 190499)
+++ branches/safari-601-branch/Source/_javascript_Core/ChangeLog 2015-10-02 13:57:48 UTC (rev 190500)
@@ -1,3 +1,16 @@
+2015-10-02 Matthew Hanson <[email protected]>
+
+ Merge r189460. rdar://problem/22802036
+
+ 2015-09-06 Mark Lam <[email protected]>
+
+ Gardening: fix broken Windows build after r189454.
+
+ Not reviewed.
+
+ * _javascript_Core.vcxproj/testapi/testapi.vcxproj:
+ * _javascript_Core.vcxproj/testapi/testapi.vcxproj.filters:
+
2015-09-03 Babak Shafiei <[email protected]>
Merge r189046.
Modified: branches/safari-601-branch/Source/_javascript_Core/_javascript_Core.vcxproj/testapi/testapi.vcxproj (190499 => 190500)
--- branches/safari-601-branch/Source/_javascript_Core/_javascript_Core.vcxproj/testapi/testapi.vcxproj 2015-10-02 13:57:41 UTC (rev 190499)
+++ branches/safari-601-branch/Source/_javascript_Core/_javascript_Core.vcxproj/testapi/testapi.vcxproj 2015-10-02 13:57:48 UTC (rev 190500)
@@ -298,6 +298,8 @@
<ClInclude Include="..\..\API\tests\CustomGlobalObjectClassTest.h" />
<ClCompile Include="..\..\API\tests\GlobalContextWithFinalizerTest.cpp" />
<ClInclude Include="..\..\API\tests\GlobalContextWithFinalizerTest.h" />
+ <ClCompile Include="..\..\API\tests\PingPongStackOverflowTest.cpp" />
+ <ClInclude Include="..\..\API\tests\PingPongStackOverflowTest.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
Modified: branches/safari-601-branch/Source/_javascript_Core/_javascript_Core.vcxproj/testapi/testapi.vcxproj.filters (190499 => 190500)
--- branches/safari-601-branch/Source/_javascript_Core/_javascript_Core.vcxproj/testapi/testapi.vcxproj.filters 2015-10-02 13:57:41 UTC (rev 190499)
+++ branches/safari-601-branch/Source/_javascript_Core/_javascript_Core.vcxproj/testapi/testapi.vcxproj.filters 2015-10-02 13:57:48 UTC (rev 190500)
@@ -14,5 +14,7 @@
<ClInclude Include="..\..\API\tests\CustomGlobalObjectClassTest.h" />
<ClCompile Include="..\..\API\tests\GlobalContextWithFinalizerTest.cpp" />
<ClInclude Include="..\..\API\tests\GlobalContextWithFinalizerTest.h" />
+ <ClCompile Include="..\..\API\tests\PingPongStackOverflowTest.cpp" />
+ <ClInclude Include="..\..\API\tests\PingPongStackOverflowTest.h" />
</ItemGroup>
</Project>
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
