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

[darin]

The following commit has been merged in the debian/unstable branch:
commit 4fd7267b1720d4f407a7c645ea53c6795b38eec6
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Aug 28 07:04:40 2002 +0000

    	- fixed 3030212 -- Problems rendering pages that specify "x-mac-roman" character
    	set (like our Danish help pages)
    
            * kwq/mac-encodings.txt: Added x-mac-roman as an alias for macintosh.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1925 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 4c5f4a1..f2b5cce 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,10 @@
+2002-08-28  Darin Adler  <darin at apple.com>
+
+	- fixed 3030212 -- Problems rendering pages that specify "x-mac-roman" character
+	set (like our Danish help pages)
+
+        * kwq/mac-encodings.txt: Added x-mac-roman as an alias for macintosh.
+
 2002-08-27  Darin Adler  <darin at apple.com>
 
         * force-clean-timestamp: Dave's changes require a full build. I found out the
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 4c5f4a1..f2b5cce 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,10 @@
+2002-08-28  Darin Adler  <darin at apple.com>
+
+	- fixed 3030212 -- Problems rendering pages that specify "x-mac-roman" character
+	set (like our Danish help pages)
+
+        * kwq/mac-encodings.txt: Added x-mac-roman as an alias for macintosh.
+
 2002-08-27  Darin Adler  <darin at apple.com>
 
         * force-clean-timestamp: Dave's changes require a full build. I found out the
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 4c5f4a1..f2b5cce 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,10 @@
+2002-08-28  Darin Adler  <darin at apple.com>
+
+	- fixed 3030212 -- Problems rendering pages that specify "x-mac-roman" character
+	set (like our Danish help pages)
+
+        * kwq/mac-encodings.txt: Added x-mac-roman as an alias for macintosh.
+
 2002-08-27  Darin Adler  <darin at apple.com>
 
         * force-clean-timestamp: Dave's changes require a full build. I found out the
diff --git a/WebCore/kwq/mac-encodings.txt b/WebCore/kwq/mac-encodings.txt
index 4649408..58b567f 100644
--- a/WebCore/kwq/mac-encodings.txt
+++ b/WebCore/kwq/mac-encodings.txt
@@ -3,7 +3,7 @@
 # repeated here; mentioning any one character set from a group in there pulls in all the aliases in
 # that group.
 
-MacRoman: macintosh
+MacRoman: macintosh, x-mac-roman
 WindowsLatin1: windows-1252, x-ansi
 ISOLatin1: iso-8859-1, iso8859-1
 NextStepLatin: x-nextstep

-- 
WebKit Debian packaging