[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[jocelyn.turcotte at nokia.com]

The following commit has been merged in the webkit-1.2 branch:
commit 09d2e5b5e52ec2599af02e1a8cefd2c66fbe32c5
Author: jocelyn.turcotte at nokia.com <jocelyn.turcotte at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 14 13:18:29 2010 +0000

    [Qt] Unreviewed build fix on Windows.
    
    * platform/graphics/transforms/TransformationMatrix.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53260 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index fe256c4..45ffc65 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,9 @@
+2010-01-14  Jocelyn Turcotte  <jocelyn.turcotte at nokia.com>
+
+        [Qt] Unreviewed build fix on Windows.
+
+        * platform/graphics/transforms/TransformationMatrix.h:
+
 2010-01-14  Andreas Kling  <andreas.kling at nokia.com>
 
         Reviewed by Kenneth Rohde Christiansen.
diff --git a/WebCore/platform/graphics/transforms/TransformationMatrix.h b/WebCore/platform/graphics/transforms/TransformationMatrix.h
index be9beef..c0ac972 100644
--- a/WebCore/platform/graphics/transforms/TransformationMatrix.h
+++ b/WebCore/platform/graphics/transforms/TransformationMatrix.h
@@ -41,10 +41,11 @@
 #include <SkMatrix.h>
 #elif PLATFORM(WX) && USE(WXGC)
 #include <wx/graphics.h>
+#endif
+
 #if OS(WINDOWS)
 #include <windows.h>
 #endif
-#endif
 
 namespace WebCore {
 

-- 
WebKit Debian packaging