Title: [201029] branches/safari-602.1.32-branch/Source/WebKit2
- Revision
- 201029
- Author
- [email protected]
- Date
- 2016-05-17 11:49:06 -0700 (Tue, 17 May 2016)
Log Message
Merge r200891. rdar://problem/26269611
Modified Paths
Diff
Modified: branches/safari-602.1.32-branch/Source/WebKit2/ChangeLog (201028 => 201029)
--- branches/safari-602.1.32-branch/Source/WebKit2/ChangeLog 2016-05-17 18:49:04 UTC (rev 201028)
+++ branches/safari-602.1.32-branch/Source/WebKit2/ChangeLog 2016-05-17 18:49:06 UTC (rev 201029)
@@ -1,5 +1,15 @@
2016-05-17 Babak Shafiei <[email protected]>
+ Merge r200891. rdar://problem/26269611
+
+ 2016-05-13 Dan Bernstein <[email protected]>
+
+ Try to fix some non-iOS builds.
+
+ * mac/postprocess-framework-headers.sh:
+
+2016-05-17 Babak Shafiei <[email protected]>
+
Merge r200877. rdar://problem/26269611
2016-05-13 Ryan Haddad <[email protected]>
Modified: branches/safari-602.1.32-branch/Source/WebKit2/mac/postprocess-framework-headers.sh (201028 => 201029)
--- branches/safari-602.1.32-branch/Source/WebKit2/mac/postprocess-framework-headers.sh 2016-05-17 18:49:04 UTC (rev 201028)
+++ branches/safari-602.1.32-branch/Source/WebKit2/mac/postprocess-framework-headers.sh 2016-05-17 18:49:06 UTC (rev 201029)
@@ -76,7 +76,7 @@
-e s/^WK_CLASS_DEPRECATED/NS_CLASS_DEPRECATED/
)
else
- SED_OPTIONS+=(-e 's/WK_(CLASS_|ENUM_)?AVAILABLE(_IOS|_MAC)?\([^\)]+\)//g' -e 's/WK_(CLASS_)?DEPRECATED\([^\)]+\)//g')
+ SED_OPTIONS+=(-e 's/WK_(CLASS_|ENUM_)?AVAILABLE(_IOS|_MAC)?\([^\)]+\)//g' -e 's/WK_(CLASS_|ENUM_)?DEPRECATED\([^\)]+\)//g')
fi
SED_OPTIONS+=(${OTHER_SED_OPTIONS[*]})
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
