[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

benjamin.poulain at nokia.com benjamin.poulain at nokia.com
Wed Dec 22 15:47:28 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit ebe5594c8f89f43f344ea6b33ff59628727cf843
Author: benjamin.poulain at nokia.com <benjamin.poulain at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Nov 12 13:45:45 2010 +0000

    2010-11-12  Benjamin Poulain  <benjamin.poulain at nokia.com>
    
            Unreviewed fix after r71857.
    
            * UIProcess/qt/WebInspectorProxyQt.cpp:
            * WebProcess/WebPage/qt/WebInspectorQt.cpp:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71907 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index b7980f0..17e575b 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,10 @@
+2010-11-12  Benjamin Poulain  <benjamin.poulain at nokia.com>
+
+        Unreviewed fix after r71857.
+
+        * UIProcess/qt/WebInspectorProxyQt.cpp:
+        * WebProcess/WebPage/qt/WebInspectorQt.cpp:
+
 2010-11-11  Anders Carlsson  <andersca at apple.com>
 
         Reviewed by Darin Adler.
diff --git a/WebKit2/UIProcess/qt/WebInspectorProxyQt.cpp b/WebKit2/UIProcess/qt/WebInspectorProxyQt.cpp
index c2d857e..cfc1298 100644
--- a/WebKit2/UIProcess/qt/WebInspectorProxyQt.cpp
+++ b/WebKit2/UIProcess/qt/WebInspectorProxyQt.cpp
@@ -23,9 +23,9 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import "WebInspectorProxy.h"
+#include "WebInspectorProxy.h"
 
-#import <wtf/text/WTFString.h>
+#include <wtf/text/WTFString.h>
 
 #define DISABLE_NOT_IMPLEMENTED_WARNINGS 1
 #include "NotImplemented.h"
diff --git a/WebKit2/WebProcess/WebPage/qt/WebInspectorQt.cpp b/WebKit2/WebProcess/WebPage/qt/WebInspectorQt.cpp
index db5ef82..7e77705 100644
--- a/WebKit2/WebProcess/WebPage/qt/WebInspectorQt.cpp
+++ b/WebKit2/WebProcess/WebPage/qt/WebInspectorQt.cpp
@@ -23,9 +23,9 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import "WebInspector.h"
+#include "WebInspector.h"
 
-#import <wtf/text/WTFString.h>
+#include <wtf/text/WTFString.h>
 
 #define DISABLE_NOT_IMPLEMENTED_WARNINGS 1
 #include "NotImplemented.h"

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list