Title: [184762] branches/safari-601.1.32.2-branch/Source/WebKit/mac
- Revision
- 184762
- Author
- bshaf...@apple.com
- Date
- 2015-05-22 00:59:56 -0700 (Fri, 22 May 2015)
Log Message
Merged r184674.
Modified Paths
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 <bshaf...@apple.com>
+ Merge r184674.
+
+ 2015-05-20 Jer Noble <jer.no...@apple.com>
+
+ Unreviewed build fix; WebActionMenuController.mm should directly include LocalizedStrings.h
+
+ * WebView/WebActionMenuController.mm:
+
+2015-05-22 Babak Shafiei <bshaf...@apple.com>
+
Merge r184670.
2015-05-19 Jer Noble <jer.no...@apple.com>
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
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
