[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9

[kevino at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 1831f060c3c4d6482bd4ed8889bebafffa4e52fb
Author: kevino at webkit.org <kevino at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 28 22:26:39 2010 +0000

    [wx] Build fix after removal of the zlib image decoder.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54021 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index b92c048..eef3857 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,9 @@
+2010-01-28  Kevin Ollivier  <kevino at theolliviers.com>
+
+        [wx] Build fix after removal of the zlib image decoder.
+
+        * wx/build/settings.py:
+
 2010-01-28  Csaba Osztrogonác  <ossy at webkit.org>
 
         [Qt] Unreviewed, roll out r54000.
diff --git a/WebKitTools/wx/build/settings.py b/WebKitTools/wx/build/settings.py
index 6016385..df21a81 100644
--- a/WebKitTools/wx/build/settings.py
+++ b/WebKitTools/wx/build/settings.py
@@ -127,7 +127,6 @@ webcore_dirs = [
     'platform/image-decoders/ico', 
     'platform/image-decoders/jpeg', 
     'platform/image-decoders/png',
-    'platform/image-decoders/zlib',
     'platform/mock',
     'platform/network', 
     'platform/sql', 

-- 
WebKit Debian packaging