Title: [168827] branches/safari-538.34-branch/Source/WebCore
Diff
Modified: branches/safari-538.34-branch/Source/WebCore/ChangeLog (168826 => 168827)
--- branches/safari-538.34-branch/Source/WebCore/ChangeLog 2014-05-14 09:38:17 UTC (rev 168826)
+++ branches/safari-538.34-branch/Source/WebCore/ChangeLog 2014-05-14 09:40:14 UTC (rev 168827)
@@ -1,5 +1,15 @@
2014-05-14 Lucas Forschler <[email protected]>
+ Merge r168767
+
+ 2014-05-13 Dean Jackson <[email protected]>
+
+ Attempted build fix after https://bugs.webkit.org/show_bug.cgi?id=132891
+
+ * page/PageDebuggable.cpp:
+
+2014-05-14 Lucas Forschler <[email protected]>
+
Merge r168764
2014-05-13 Timothy Hatcher <[email protected]>
Modified: branches/safari-538.34-branch/Source/WebCore/page/PageDebuggable.cpp (168826 => 168827)
--- branches/safari-538.34-branch/Source/WebCore/page/PageDebuggable.cpp 2014-05-14 09:38:17 UTC (rev 168826)
+++ branches/safari-538.34-branch/Source/WebCore/page/PageDebuggable.cpp 2014-05-14 09:40:14 UTC (rev 168827)
@@ -33,12 +33,9 @@
#include "InspectorForwarding.h"
#include "MainFrame.h"
#include "Page.h"
+#include "Settings.h"
#include <inspector/InspectorAgentBase.h>
-#if PLATFORM(IOS)
-#include "Settings.h"
-#endif
-
using namespace Inspector;
namespace WebCore {
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
