[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[sullivan]

The following commit has been merged in the debian/unstable branch:
commit e406a1849e53fc5cd31bb1575989ce00c0865de7
Author: sullivan <sullivan at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Nov 6 17:33:38 2003 +0000

            - fixed broken build
    
            * khtml/xml/dom_docimpl.cpp:
            (DocumentImpl::completeURL):
            removed stray character
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5405 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 6b48170..339ca04 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,11 @@
+2003-11-06  John Sullivan  <sullivan at apple.com>
+
+        - fixed broken build
+
+        * khtml/xml/dom_docimpl.cpp:
+        (DocumentImpl::completeURL):
+        removed stray character
+
 2003-11-06  Maciej Stachowiak  <mjs at apple.com>
 
         Reviewed by Darin.
diff --git a/WebCore/khtml/xml/dom_docimpl.cpp b/WebCore/khtml/xml/dom_docimpl.cpp
index 9a4086b..528081c 100644
--- a/WebCore/khtml/xml/dom_docimpl.cpp
+++ b/WebCore/khtml/xml/dom_docimpl.cpp
@@ -2396,7 +2396,7 @@ void DocumentImpl::setDecoder(Decoder *decoder)
 
 QString DocumentImpl::completeURL(const QString &URL)
 {
-*    return KURL(baseURL(), URL, m_decoder ? m_decoder->codec() : 0).url();
+    return KURL(baseURL(), URL, m_decoder ? m_decoder->codec() : 0).url();
 }
 
 bool DocumentImpl::inPageCache()

-- 
WebKit Debian packaging