Title: [203582] branches/safari-602-branch/Tools
- Revision
- 203582
- Author
- bshaf...@apple.com
- Date
- 2016-07-22 02:26:18 -0700 (Fri, 22 Jul 2016)
Log Message
Merge r203447. rdar://problem/27056844
Modified Paths
Diff
Modified: branches/safari-602-branch/Tools/ChangeLog (203581 => 203582)
--- branches/safari-602-branch/Tools/ChangeLog 2016-07-22 09:26:16 UTC (rev 203581)
+++ branches/safari-602-branch/Tools/ChangeLog 2016-07-22 09:26:18 UTC (rev 203582)
@@ -1,5 +1,15 @@
2016-07-22 Babak Shafiei <bshaf...@apple.com>
+ Merge r203447. rdar://problem/27056844
+
+ 2016-07-20 Csaba Osztrogonác <o...@webkit.org>
+
+ Unreviewed Mac cmake buildfix after r203426. Just for fun.
+
+ * TestWebKitAPI/PlatformMac.cmake:
+
+2016-07-22 Babak Shafiei <bshaf...@apple.com>
+
Merge r203436. rdar://problem/27056844
2016-07-19 Alex Christensen <achristen...@webkit.org>
Modified: branches/safari-602-branch/Tools/TestWebKitAPI/PlatformMac.cmake (203581 => 203582)
--- branches/safari-602-branch/Tools/TestWebKitAPI/PlatformMac.cmake 2016-07-22 09:26:16 UTC (rev 203581)
+++ branches/safari-602-branch/Tools/TestWebKitAPI/PlatformMac.cmake 2016-07-22 09:26:18 UTC (rev 203582)
@@ -26,10 +26,10 @@
)
set(bundle_harness_SOURCES
+ ${TESTWEBKITAPI_DIR}/cocoa/InstanceMethodSwizzler.mm
${TESTWEBKITAPI_DIR}/cocoa/PlatformUtilitiesCocoa.mm
${TESTWEBKITAPI_DIR}/cocoa/UtilitiesCocoa.mm
${TESTWEBKITAPI_DIR}/mac/InjectedBundleControllerMac.mm
- ${TESTWEBKITAPI_DIR}/mac/InstanceMethodSwizzler.mm
${TESTWEBKITAPI_DIR}/mac/PlatformUtilitiesMac.mm
${TESTWEBKITAPI_DIR}/mac/PlatformWebViewMac.mm
${TESTWEBKITAPI_DIR}/mac/SyntheticBackingScaleFactorWindow.m
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
