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

[aroben at apple.com]

The following commit has been merged in the debian/experimental branch:
commit e30ed964e94142019e39f57b040601443d781182
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Oct 5 13:47:48 2010 +0000

    Windows linker warning fix
    
    * WebCore.vcproj/WebCore.vcproj: Exclude JSDOMTokenList.cpp from the
    build, since it is already being compiled via DerivedSources.cpp. Also
    let VS reorder some files.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69106 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 499287b..ef29e2c 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,11 @@
+2010-10-05  Adam Roben  <aroben at apple.com>
+
+        Windows linker warning fix
+
+        * WebCore.vcproj/WebCore.vcproj: Exclude JSDOMTokenList.cpp from the
+        build, since it is already being compiled via DerivedSources.cpp. Also
+        let VS reorder some files.
+
 2010-10-05  Kimmo Kinnunen  <kimmo.t.kinnunen at nokia.com>
 
         Reviewed by Kenneth Rohde Christiansen.
diff --git a/WebCore/WebCore.vcproj/WebCore.vcproj b/WebCore/WebCore.vcproj/WebCore.vcproj
index fed5913..8c326bb 100644
--- a/WebCore/WebCore.vcproj/WebCore.vcproj
+++ b/WebCore/WebCore.vcproj/WebCore.vcproj
@@ -4049,6 +4049,54 @@
 			<File
 				RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSDOMTokenList.cpp"
 				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug_Internal|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug_Cairo|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release_Cairo|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug_All|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSDOMTokenList.h"
@@ -23719,6 +23767,14 @@
 				>
 			</File>
 			<File
+				RelativePath="..\loader\NavigationScheduler.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\loader\NavigationScheduler.h"
+				>
+			</File>
+			<File
 				RelativePath="..\loader\NetscapePlugInStreamLoader.cpp"
 				>
 			</File>
@@ -23767,14 +23823,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\loader\NavigationScheduler.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\loader\NavigationScheduler.h"
-				>
-			</File>
-			<File
 				RelativePath="..\loader\Request.cpp"
 				>
 			</File>

-- 
WebKit Debian packaging