Title: [184762] branches/safari-601.1.32.2-branch/Source/WebKit/mac
Diff
Modified: branches/safari-601.1.32.2-branch/Source/WebKit/mac/ChangeLog (184761 => 184762)
--- branches/safari-601.1.32.2-branch/Source/WebKit/mac/ChangeLog 2015-05-22 07:59:09 UTC (rev 184761)
+++ branches/safari-601.1.32.2-branch/Source/WebKit/mac/ChangeLog 2015-05-22 07:59:56 UTC (rev 184762)
@@ -1,5 +1,15 @@
2015-05-22 Babak Shafiei <[email protected]>
+ Merge r184674.
+
+ 2015-05-20 Jer Noble <[email protected]>
+
+ Unreviewed build fix; WebActionMenuController.mm should directly include LocalizedStrings.h
+
+ * WebView/WebActionMenuController.mm:
+
+2015-05-22 Babak Shafiei <[email protected]>
+
Merge r184670.
2015-05-19 Jer Noble <[email protected]>
Modified: branches/safari-601.1.32.2-branch/Source/WebKit/mac/WebView/WebActionMenuController.mm (184761 => 184762)
--- branches/safari-601.1.32.2-branch/Source/WebKit/mac/WebView/WebActionMenuController.mm 2015-05-22 07:59:09 UTC (rev 184761)
+++ branches/safari-601.1.32.2-branch/Source/WebKit/mac/WebView/WebActionMenuController.mm 2015-05-22 07:59:56 UTC (rev 184762)
@@ -30,6 +30,7 @@
#import "DOMElementInternal.h"
#import "DOMNodeInternal.h"
#import "DOMRangeInternal.h"
+#import "LocalizedStrings.h"
#import "WebDataSource.h"
#import "WebDocumentInternal.h"
#import "WebElementDictionary.h"
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
