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

[ossy at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 3d61a29f2dc28c8b5c4d22e94a06b50326610901
Author: ossy at webkit.org <ossy at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Dec 8 10:04:46 2009 +0000

    Rubber-stamped by Kenneth Rohde Christiansen.
    
    Patch by Andras Becsi <abecsi at inf.u-szeged.hu> on 2009-12-08
    [Qt] Build fix of duplicated platform/graphics/filters/FEGaussianBlur.cpp in WebCore.pro after enabled svg filters.
    
    No new tests needed.
    * WebCore.pro:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51838 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index acb9b54..c5229e3 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2009-12-08  Andras Becsi  <abecsi at inf.u-szeged.hu>
+
+        Rubber-stamped by Kenneth Rohde Christiansen.
+
+        [Qt] Build fix of duplicated platform/graphics/filters/FEGaussianBlur.cpp in WebCore.pro after enabled svg filters.
+
+        No new tests needed.
+        * WebCore.pro:
+
 2009-12-07  Shinichiro Hamaji  <hamaji at chromium.org>
 
         Reviewed by Darin Adler.
diff --git a/WebCore/WebCore.pro b/WebCore/WebCore.pro
index 03efb2f..13ca356 100644
--- a/WebCore/WebCore.pro
+++ b/WebCore/WebCore.pro
@@ -1192,7 +1192,6 @@ SOURCES += \
     platform/FileChooser.cpp \
     platform/GeolocationService.cpp \
     platform/image-decoders/qt/RGBA32BufferQt.cpp \
-    platform/graphics/filters/FEGaussianBlur.cpp \
     platform/graphics/FontDescription.cpp \
     platform/graphics/FontFallbackList.cpp \
     platform/graphics/FontFamily.cpp \

-- 
WebKit Debian packaging