Title: [210391] branches/safari-603-branch/Source
- Revision
- 210391
- Author
- [email protected]
- Date
- 2017-01-05 15:49:39 -0800 (Thu, 05 Jan 2017)
Log Message
Merge r210359. rdar://problem/29882478
Modified Paths
Diff
Modified: branches/safari-603-branch/Source/_javascript_Core/CMakeLists.txt (210390 => 210391)
--- branches/safari-603-branch/Source/_javascript_Core/CMakeLists.txt 2017-01-05 23:49:36 UTC (rev 210390)
+++ branches/safari-603-branch/Source/_javascript_Core/CMakeLists.txt 2017-01-05 23:49:39 UTC (rev 210391)
@@ -3,6 +3,7 @@
set_property(DIRECTORY . PROPERTY FOLDER "_javascript_Core")
set(_javascript_Core_INCLUDE_DIRECTORIES
+ "${CMAKE_BINARY_DIR}"
"${_javascript_CORE_DIR}"
"${_javascript_CORE_DIR}/.."
"${_javascript_CORE_DIR}/API"
Modified: branches/safari-603-branch/Source/_javascript_Core/ChangeLog (210390 => 210391)
--- branches/safari-603-branch/Source/_javascript_Core/ChangeLog 2017-01-05 23:49:36 UTC (rev 210390)
+++ branches/safari-603-branch/Source/_javascript_Core/ChangeLog 2017-01-05 23:49:39 UTC (rev 210391)
@@ -1,5 +1,20 @@
2017-01-05 Matthew Hanson <[email protected]>
+ Merge r210359. rdar://problem/29882478
+
+ 2017-01-05 Per Arne Vollan <[email protected]>
+
+ [Win] Compile error.
+ https://bugs.webkit.org/show_bug.cgi?id=166726
+
+ Reviewed by Alex Christensen.
+
+ Add include folder.
+
+ * CMakeLists.txt:
+
+2017-01-05 Matthew Hanson <[email protected]>
+
Merge r210028. rdar://problem/29747874
2016-12-20 JF Bastien <[email protected]>
Modified: branches/safari-603-branch/Source/WebCore/CMakeLists.txt (210390 => 210391)
--- branches/safari-603-branch/Source/WebCore/CMakeLists.txt 2017-01-05 23:49:36 UTC (rev 210390)
+++ branches/safari-603-branch/Source/WebCore/CMakeLists.txt 2017-01-05 23:49:39 UTC (rev 210391)
@@ -3,6 +3,7 @@
set_property(DIRECTORY . PROPERTY FOLDER "WebCore")
set(WebCore_INCLUDE_DIRECTORIES
+ "${CMAKE_BINARY_DIR}"
"${WEBCORE_DIR}"
"${WEBCORE_DIR}/Modules/airplay"
"${WEBCORE_DIR}/Modules/applepay"
Modified: branches/safari-603-branch/Source/WebCore/ChangeLog (210390 => 210391)
--- branches/safari-603-branch/Source/WebCore/ChangeLog 2017-01-05 23:49:36 UTC (rev 210390)
+++ branches/safari-603-branch/Source/WebCore/ChangeLog 2017-01-05 23:49:39 UTC (rev 210391)
@@ -1,5 +1,20 @@
2017-01-05 Matthew Hanson <[email protected]>
+ Merge r210359. rdar://problem/29882478
+
+ 2017-01-05 Per Arne Vollan <[email protected]>
+
+ [Win] Compile error.
+ https://bugs.webkit.org/show_bug.cgi?id=166726
+
+ Reviewed by Alex Christensen.
+
+ Add include folder.
+
+ * CMakeLists.txt:
+
+2017-01-05 Matthew Hanson <[email protected]>
+
Merge r210328. rdar://problem/29870673
2017-01-05 Wenson Hsieh <[email protected]>
Modified: branches/safari-603-branch/Source/WebKit/CMakeLists.txt (210390 => 210391)
--- branches/safari-603-branch/Source/WebKit/CMakeLists.txt 2017-01-05 23:49:36 UTC (rev 210390)
+++ branches/safari-603-branch/Source/WebKit/CMakeLists.txt 2017-01-05 23:49:39 UTC (rev 210391)
@@ -17,6 +17,7 @@
)
set(WebKit_INCLUDE_DIRECTORIES
+ "${CMAKE_BINARY_DIR}"
"${WEBKIT_DIR}/Storage"
"${WEBKIT_DIR}/WebCoreSupport"
"${DERIVED_SOURCES_DIR}/ForwardingHeaders/_javascript_Core"
Modified: branches/safari-603-branch/Source/WebKit/ChangeLog (210390 => 210391)
--- branches/safari-603-branch/Source/WebKit/ChangeLog 2017-01-05 23:49:36 UTC (rev 210390)
+++ branches/safari-603-branch/Source/WebKit/ChangeLog 2017-01-05 23:49:39 UTC (rev 210391)
@@ -1,3 +1,16 @@
+2017-01-05 Matthew Hanson <[email protected]>
+
+ Merge r210359. rdar://problem/29882478
+
+ 2017-01-05 Per Arne Vollan <[email protected]>
+
+ [Win] Compile error.
+ https://bugs.webkit.org/show_bug.cgi?id=166726
+
+ Add include folder.
+
+ * CMakeLists.txt:
+
2016-12-15 Myles C. Maxfield <[email protected]>
Sort Xcode project files
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
