[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e

[senorblanco at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 330c1db82679203865707f55b3e6ba128df8df8c
Author: senorblanco at chromium.org <senorblanco at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 7 00:47:25 2011 +0000

    2011-01-06  Stephen White  <senorblanco at chromium.org>
    
            Unreviewed; chromium test expectations update.
    
            * platform/chromium/test_expectations.txt:
            Remove duplicate expectations.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75212 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 010a87e..fe715f3 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,10 @@
+2011-01-06  Stephen White  <senorblanco at chromium.org>
+
+        Unreviewed; chromium test expectations update.
+
+        * platform/chromium/test_expectations.txt:
+        Remove duplicate expectations.
+
 2011-01-06  Adam Roben  <aroben at apple.com>
 
         Add/update Windows-specific test results for recent regressions
diff --git a/LayoutTests/platform/chromium/test_expectations.txt b/LayoutTests/platform/chromium/test_expectations.txt
index a300f35..6cada9e 100644
--- a/LayoutTests/platform/chromium/test_expectations.txt
+++ b/LayoutTests/platform/chromium/test_expectations.txt
@@ -2586,7 +2586,7 @@ BUGWEBGL : fast/canvas/webgl/glsl-conformance.html = CRASH
 
 // These were not fixed by the Mesa 7.9 upgrade. Need to investigate.
 BUGCR60651 WIN : fast/canvas/webgl/gl-object-get-calls.html = TIMEOUT PASS
-BUGCR60651 WIN : fast/canvas/webgl/glsl-conformance.html = TIMEOUT FAIL
+// BUGCR60651 WIN : fast/canvas/webgl/glsl-conformance.html = TIMEOUT FAIL
 BUGCR60651 WIN : fast/canvas/webgl/uniform-location.html = TIMEOUT CRASH
 BUGCR60651 LINUX MAC : fast/canvas/webgl/uniform-location.html = TEXT
 

-- 
WebKit Debian packaging