Title: [184763] branches/safari-601.1.32.2-branch/Source/WebKit/mac
Diff
Modified: branches/safari-601.1.32.2-branch/Source/WebKit/mac/ChangeLog (184762 => 184763)
--- branches/safari-601.1.32.2-branch/Source/WebKit/mac/ChangeLog 2015-05-22 07:59:56 UTC (rev 184762)
+++ branches/safari-601.1.32.2-branch/Source/WebKit/mac/ChangeLog 2015-05-22 08:00:46 UTC (rev 184763)
@@ -1,5 +1,15 @@
2015-05-22 Babak Shafiei <[email protected]>
+ Merge r184678.
+
+ 2015-05-20 Alex Christensen <[email protected]>
+
+ Unreviewed build fix; LocalizedStrings.h is in WebCore.
+
+ * WebView/WebActionMenuController.mm:
+
+2015-05-22 Babak Shafiei <[email protected]>
+
Merge r184674.
2015-05-20 Jer Noble <[email protected]>
Modified: branches/safari-601.1.32.2-branch/Source/WebKit/mac/WebView/WebActionMenuController.mm (184762 => 184763)
--- branches/safari-601.1.32.2-branch/Source/WebKit/mac/WebView/WebActionMenuController.mm 2015-05-22 07:59:56 UTC (rev 184762)
+++ branches/safari-601.1.32.2-branch/Source/WebKit/mac/WebView/WebActionMenuController.mm 2015-05-22 08:00:46 UTC (rev 184763)
@@ -30,7 +30,6 @@
#import "DOMElementInternal.h"
#import "DOMNodeInternal.h"
#import "DOMRangeInternal.h"
-#import "LocalizedStrings.h"
#import "WebDataSource.h"
#import "WebDocumentInternal.h"
#import "WebElementDictionary.h"
@@ -55,6 +54,7 @@
#import <WebCore/Frame.h>
#import <WebCore/FrameView.h>
#import <WebCore/HTMLConverter.h>
+#import <WebCore/LocalizedStrings.h>
#import <WebCore/NSMenuSPI.h>
#import <WebCore/NSSharingServicePickerSPI.h>
#import <WebCore/NSSharingServiceSPI.h>
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
