[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
jamesr at google.com
jamesr at google.com
Wed Dec 22 13:34:44 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit be1d907269b03988fcccae312fb323ebf330b217
Author: jamesr at google.com <jamesr at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Sep 20 20:01:15 2010 +0000
2010-09-20 James Robinson <jamesr at chromium.org>
Fix bad merge in chromium test_expectations.txt
* platform/chromium/test_expectations.txt:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67875 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 3580f7a..bfd0c8a 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,9 @@
+2010-09-20 James Robinson <jamesr at chromium.org>
+
+ Fix bad merge in chromium test_expectations.txt
+
+ * platform/chromium/test_expectations.txt:
+
2010-09-17 James Robinson <jamesr at chromium.org>
Reviewed by Andreas Kling
diff --git a/LayoutTests/platform/chromium/test_expectations.txt b/LayoutTests/platform/chromium/test_expectations.txt
index 3dd7c6d..9267a64 100644
--- a/LayoutTests/platform/chromium/test_expectations.txt
+++ b/LayoutTests/platform/chromium/test_expectations.txt
@@ -2662,8 +2662,6 @@ BUG45991 MAC : canvas/philip/tests/2d.shadow.enable.y.html = TEXT
BUG45991 MAC : canvas/philip/tests/2d.strokeRect.zero.4.html = TEXT
BUG45991 MAC : canvas/philip/tests/toDataURL.jpeg.alpha.html = TEXT
-BUG45991 WIN : canvas/philip/tests/2d.gradient.radial.touch2.html = TEXT
-
// Many of these are skipped on the mac platform.
BUG45991 MAC : canvas/philip/tests/2d.gradient.radial.cone.front.html = TEXT
BUG45991 MAC : canvas/philip/tests/2d.gradient.radial.inside2.html = TEXT
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list