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

[ap at apple.com]

The following commit has been merged in the webkit-1.2 branch:
commit 9ee04b2e7604eb425d87bda787a1ccaf8c61de4f
Author: ap at apple.com <ap at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jan 27 07:02:58 2010 +0000

            More Windows build fixing.
    
            * win/tools/vsprops/common.vsprops: Disable warning C4180 (qualifier applied to function
            type has no meaning; ignored). This is a known bug - MSVC tries to compile a wrong
            specialization sometimes - but it's not instantiated, so it's harmless.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53904 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitLibraries/ChangeLog b/WebKitLibraries/ChangeLog
index 98c25b8..0cda672 100644
--- a/WebKitLibraries/ChangeLog
+++ b/WebKitLibraries/ChangeLog
@@ -1,3 +1,11 @@
+2010-01-26  Alexey Proskuryakov  <ap at apple.com>
+
+        More Windows build fixing.
+
+        * win/tools/vsprops/common.vsprops: Disable warning C4180 (qualifier applied to function
+        type has no meaning; ignored). This is a known bug - MSVC tries to compile a wrong
+        specialization sometimes - but it's not instantiated, so it's harmless.
+
 2010-01-22  Steve Falkenburg  <sfalken at apple.com>
 
         Reviewed by Darin Adler.
diff --git a/WebKitLibraries/win/tools/vsprops/common.vsprops b/WebKitLibraries/win/tools/vsprops/common.vsprops
index a8b4773..8976ceb 100644
--- a/WebKitLibraries/win/tools/vsprops/common.vsprops
+++ b/WebKitLibraries/win/tools/vsprops/common.vsprops
@@ -15,7 +15,7 @@
 		WarningLevel="4"
 		WarnAsError="true"
 		DebugInformationFormat="3"
-		DisableSpecificWarnings="4018;4068;4099;4100;4127;4138;4189;4244;4251;4275;4291;4305;4344;4355;4389;4503;4505;4510;4512;4610;4706;4800;4951;4952;4996;6011;6031;6211;6246;6255;6387"
+		DisableSpecificWarnings="4018;4068;4099;4100;4127;4138;4180;4189;4244;4251;4275;4291;4305;4344;4355;4389;4503;4505;4510;4512;4610;4706;4800;4951;4952;4996;6011;6031;6211;6246;6255;6387"
 	/>
 	<Tool
 		Name="VCLibrarianTool"

-- 
WebKit Debian packaging