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

[hyatt]

The following commit has been merged in the debian/unstable branch:
commit 538a0d471e097f7d85713f907048dbc1ad4c0d64
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Nov 17 05:15:29 2002 +0000

    	Fix for 3078240, <pre> should not establish its own text-align,
    	but should instead inherit from its parent.
    
            * khtml/css/html4.css:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2713 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 58fe9ee..978a922 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,12 @@
 2002-11-16  David Hyatt  <hyatt at apple.com>
 
+	Fix for 3078240, <pre> should not establish its own text-align,
+	but should instead inherit from its parent.
+	
+        * khtml/css/html4.css:
+
+2002-11-16  David Hyatt  <hyatt at apple.com>
+
 	Rewrite the calculation of min and max width for <pre>s.  This
 	is the second stage of the whitespace rewrite (third stage
 	will be to stop morphing newlines).
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 58fe9ee..978a922 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,12 @@
 2002-11-16  David Hyatt  <hyatt at apple.com>
 
+	Fix for 3078240, <pre> should not establish its own text-align,
+	but should instead inherit from its parent.
+	
+        * khtml/css/html4.css:
+
+2002-11-16  David Hyatt  <hyatt at apple.com>
+
 	Rewrite the calculation of min and max width for <pre>s.  This
 	is the second stage of the whitespace rewrite (third stage
 	will be to stop morphing newlines).
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 58fe9ee..978a922 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,12 @@
 2002-11-16  David Hyatt  <hyatt at apple.com>
 
+	Fix for 3078240, <pre> should not establish its own text-align,
+	but should instead inherit from its parent.
+	
+        * khtml/css/html4.css:
+
+2002-11-16  David Hyatt  <hyatt at apple.com>
+
 	Rewrite the calculation of min and max width for <pre>s.  This
 	is the second stage of the whitespace rewrite (third stage
 	will be to stop morphing newlines).
diff --git a/WebCore/khtml/css/html4.css b/WebCore/khtml/css/html4.css
index e03e587..8cba6a8 100644
--- a/WebCore/khtml/css/html4.css
+++ b/WebCore/khtml/css/html4.css
@@ -440,8 +440,7 @@ PLAINTEXT {
 	display: block;
 	font-family: monospace; 
 	white-space: pre; 
-	text-align: -konq-auto;
-    margin: 1_qem 0;
+	margin: 1_qem 0;
 }
       
 BIG { 

-- 
WebKit Debian packaging