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

[rjw]

The following commit has been merged in the debian/unstable branch:
commit 9cc408949d6036d008d549c6d4c0ec73469b4e60
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Sep 24 23:22:38 2002 +0000

            Added FIXME not about unresolved issue with CFStringEncoding/NSStringEncoding.
    
            * WebView.subproj/WebController.h:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2152 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index c4f66fe..6b0dd2e 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,11 @@
 2002-09-24  Richard Williamson   <rjw at apple.com>
 
+        Added FIXME not about unresolved issue with CFStringEncoding/NSStringEncoding.
+        
+        * WebView.subproj/WebController.h:
+
+2002-09-24  Richard Williamson   <rjw at apple.com>
+
         Documentation for WebDataSource and WebFrame.
         
         * WebView.subproj/WebDataSource.h:
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index c4f66fe..6b0dd2e 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,5 +1,11 @@
 2002-09-24  Richard Williamson   <rjw at apple.com>
 
+        Added FIXME not about unresolved issue with CFStringEncoding/NSStringEncoding.
+        
+        * WebView.subproj/WebController.h:
+
+2002-09-24  Richard Williamson   <rjw at apple.com>
+
         Documentation for WebDataSource and WebFrame.
         
         * WebView.subproj/WebDataSource.h:
diff --git a/WebKit/WebView.subproj/WebController.h b/WebKit/WebView.subproj/WebController.h
index 1913215..712f6a1 100644
--- a/WebKit/WebView.subproj/WebController.h
+++ b/WebKit/WebView.subproj/WebController.h
@@ -335,12 +335,14 @@ extern NSString *WebElementFrameKey;
     The text encoding automatically goes back to the default when the top level frame
     changes to a new location.
     @param encoding
+    // FIXME Resolve whether to use NSStringEncoding
 */
 - (void)setCustomTextEncoding:(CFStringEncoding)encoding;
 
 /*!
     @method customTextEncoding
     @result Returns the custom text encoding.
+    // FIXME Resolve whether to use NSStringEncoding
 */
 - (CFStringEncoding)customTextEncoding;
 
diff --git a/WebKit/WebView.subproj/WebView.h b/WebKit/WebView.subproj/WebView.h
index 1913215..712f6a1 100644
--- a/WebKit/WebView.subproj/WebView.h
+++ b/WebKit/WebView.subproj/WebView.h
@@ -335,12 +335,14 @@ extern NSString *WebElementFrameKey;
     The text encoding automatically goes back to the default when the top level frame
     changes to a new location.
     @param encoding
+    // FIXME Resolve whether to use NSStringEncoding
 */
 - (void)setCustomTextEncoding:(CFStringEncoding)encoding;
 
 /*!
     @method customTextEncoding
     @result Returns the custom text encoding.
+    // FIXME Resolve whether to use NSStringEncoding
 */
 - (CFStringEncoding)customTextEncoding;
 

-- 
WebKit Debian packaging