[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[aroben at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit 6708d18b8f5516cd3b882f6357e4b763e6c39c8a
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Oct 14 16:23:50 2009 +0000

    Windows build fix
    
    * WebKit.vcproj/Interfaces.vcproj: Exclude IWebHistoryDelegate and
    IWebNavigationData from the build (they get #imported via WebKit.idl).
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49566 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index e6a6a0d..16ca4cc 100644
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -1,3 +1,10 @@
+2009-10-14  Adam Roben  <aroben at apple.com>
+
+        Windows build fix
+
+        * WebKit.vcproj/Interfaces.vcproj: Exclude IWebHistoryDelegate and
+        IWebNavigationData from the build (they get #imported via WebKit.idl).
+
 2009-10-14  Brady Eidson  <beidson at apple.com>
 
         Reviewed by Sam Weinig.
diff --git a/WebKit/win/WebKit.vcproj/Interfaces.vcproj b/WebKit/win/WebKit.vcproj/Interfaces.vcproj
index d6046a2..75c7c11 100644
--- a/WebKit/win/WebKit.vcproj/Interfaces.vcproj
+++ b/WebKit/win/WebKit.vcproj/Interfaces.vcproj
@@ -794,6 +794,14 @@
 					Name="VCMIDLTool"
 				/>
 			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				ExcludedFromBuild="true"
+				>
+				<Tool
+					Name="VCMIDLTool"
+				/>
+			</FileConfiguration>
 		</File>
 		<File
 			RelativePath="..\Interfaces\IWebHistoryItem.idl"
@@ -1066,6 +1074,14 @@
 					Name="VCMIDLTool"
 				/>
 			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				ExcludedFromBuild="true"
+				>
+				<Tool
+					Name="VCMIDLTool"
+				/>
+			</FileConfiguration>
 		</File>
 		<File
 			RelativePath="..\Interfaces\IWebNotification.idl"

-- 
WebKit Debian packaging