Title: [92925] branches/safari-534.51-branch/Source/WebKit2
Revision
92925
Author
[email protected]
Date
2011-08-11 22:23:40 -0700 (Thu, 11 Aug 2011)

Log Message

Merge r91100.

Modified Paths

Diff

Modified: branches/safari-534.51-branch/Source/WebKit2/ChangeLog (92924 => 92925)


--- branches/safari-534.51-branch/Source/WebKit2/ChangeLog	2011-08-12 05:22:46 UTC (rev 92924)
+++ branches/safari-534.51-branch/Source/WebKit2/ChangeLog	2011-08-12 05:23:40 UTC (rev 92925)
@@ -1,5 +1,15 @@
 2011-08-11  Lucas Forschler  <[email protected]>
 
+    Merged 91100
+
+    2011-07-15  Dan Bernstein  <[email protected]>
+
+            Windows build fix.
+
+            * UIProcess/win/WebView.cpp:
+
+2011-08-11  Lucas Forschler  <[email protected]>
+
     Merged 91098
 
     2011-07-15  Dan Bernstein  <[email protected]>

Modified: branches/safari-534.51-branch/Source/WebKit2/UIProcess/win/WebView.cpp (92924 => 92925)


--- branches/safari-534.51-branch/Source/WebKit2/UIProcess/win/WebView.cpp	2011-08-12 05:22:46 UTC (rev 92924)
+++ branches/safari-534.51-branch/Source/WebKit2/UIProcess/win/WebView.cpp	2011-08-12 05:23:40 UTC (rev 92925)
@@ -33,7 +33,6 @@
 #include "NativeWebKeyboardEvent.h"
 #include "NativeWebMouseEvent.h"
 #include "NativeWebWheelEvent.h"
-#include "NotImplemented.h"
 #include "Region.h"
 #include "RunLoop.h"
 #include "WKAPICast.h"
@@ -52,6 +51,7 @@
 #include <WebCore/GraphicsContextCG.h>
 #endif
 #include <WebCore/IntRect.h>
+#include <WebCore/NotImplemented.h>
 #include <WebCore/SoftLinking.h>
 #include <WebCore/WebCoreInstanceHandle.h>
 #include <WebCore/WindowMessageBroadcaster.h>
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to