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

[sfalken at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 24917c8666338a27396ef2a40bb3aa49f16bf7a1
Author: sfalken at apple.com <sfalken at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jul 13 18:27:09 2010 +0000

    2010-07-13  Steve Falkenburg  <sfalken at apple.com>
    
            Reviewed by Ada Chan.
    
            Fix missing resources causing layout test failures
            https://bugs.webkit.org/show_bug.cgi?id=42179
    
            Quick fix to get the layout tests going again.
            I'll work on getting resource.h from WebKit into a cross-project
            propagated header after this lands.
    
            * win/WebKit2.rc:
            * win/resource.h: Copied from WebKit/win/WebKit.vcproj/resource.h.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63227 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 64a6cf3..7fa9f67 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,17 @@
+2010-07-13  Steve Falkenburg  <sfalken at apple.com>
+
+        Reviewed by Ada Chan.
+
+        Fix missing resources causing layout test failures
+        https://bugs.webkit.org/show_bug.cgi?id=42179
+        
+        Quick fix to get the layout tests going again.
+        I'll work on getting resource.h from WebKit into a cross-project
+        propagated header after this lands.
+
+        * win/WebKit2.rc:
+        * win/resource.h: Copied from WebKit/win/WebKit.vcproj/resource.h.
+
 2010-07-13  Anders Carlsson  <andersca at apple.com>
 
         Reviewed by Adam Roben.
diff --git a/WebKit2/win/WebKit2.rc b/WebKit2/win/WebKit2.rc
index 9e3463f..7a5176a 100644
--- a/WebKit2/win/WebKit2.rc
+++ b/WebKit2/win/WebKit2.rc
@@ -1,6 +1,7 @@
 // Microsoft Visual C++ generated resource script.
 //
 #include "autoversion.h"
+#include "resource.h"
 #include "winresrc.h"
 
 #ifdef _WIN32
diff --git a/WebKit/win/WebKit.vcproj/resource.h b/WebKit2/win/resource.h
similarity index 100%
copy from WebKit/win/WebKit.vcproj/resource.h
copy to WebKit2/win/resource.h

-- 
WebKit Debian packaging