[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.21-584-g1e41756

[bweinstein at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit 1bc942e41cbb4aba19512e28cdc19ff26373da33
Author: bweinstein at apple.com <bweinstein at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Feb 11 21:20:31 2010 +0000

    Turn off 3D_CANVAS and touch WebCorePrefix.h to force a rebuild.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54671 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/WebCorePrefix.h b/WebCore/WebCorePrefix.h
index ac2014e..1ffb675 100644
--- a/WebCore/WebCorePrefix.h
+++ b/WebCore/WebCorePrefix.h
@@ -153,4 +153,3 @@
 #undef try
 #undef catch
 #endif
-
diff --git a/WebKitLibraries/win/tools/vsprops/FeatureDefines.vsprops b/WebKitLibraries/win/tools/vsprops/FeatureDefines.vsprops
index 98fba4e..9e8ece1 100644
--- a/WebKitLibraries/win/tools/vsprops/FeatureDefines.vsprops
+++ b/WebKitLibraries/win/tools/vsprops/FeatureDefines.vsprops
@@ -13,7 +13,7 @@
 	/>
   <UserMacro
 		Name="ENABLE_3D_CANVAS"
-		Value="ENABLE_3D_CANVAS"
+		Value=""
 		PerformEnvironmentSet="true"
 	/>
   <UserMacro

-- 
WebKit Debian packaging