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

[mjs]

The following commit has been merged in the debian/unstable branch:
commit 3bd659b3d0d9a80c56147460cdb9919f3a53f831
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Apr 18 01:00:30 2002 +0000

    	Reviewed by: Darin Adler  <darin at apple.com>
    
    	* kjs/testkjs.cpp: Don't include <iostream.h> to avoid gcc3
    	warning.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1041 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 21cd409..31224ce 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,10 @@
+2002-04-17  Maciej Stachowiak  <mjs at apple.com>
+
+	Reviewed by: Darin Adler  <darin at apple.com>
+
+	* kjs/testkjs.cpp: Don't include <iostream.h> to avoid gcc3
+	warning.
+
 2002-04-15  Darin Adler  <darin at apple.com>
 
 	Reviwed by: Maciej Stachowiak  <mjs at apple.com>
diff --git a/JavaScriptCore/ChangeLog-2002-12-03 b/JavaScriptCore/ChangeLog-2002-12-03
index 21cd409..31224ce 100644
--- a/JavaScriptCore/ChangeLog-2002-12-03
+++ b/JavaScriptCore/ChangeLog-2002-12-03
@@ -1,3 +1,10 @@
+2002-04-17  Maciej Stachowiak  <mjs at apple.com>
+
+	Reviewed by: Darin Adler  <darin at apple.com>
+
+	* kjs/testkjs.cpp: Don't include <iostream.h> to avoid gcc3
+	warning.
+
 2002-04-15  Darin Adler  <darin at apple.com>
 
 	Reviwed by: Maciej Stachowiak  <mjs at apple.com>
diff --git a/JavaScriptCore/ChangeLog-2003-10-25 b/JavaScriptCore/ChangeLog-2003-10-25
index 21cd409..31224ce 100644
--- a/JavaScriptCore/ChangeLog-2003-10-25
+++ b/JavaScriptCore/ChangeLog-2003-10-25
@@ -1,3 +1,10 @@
+2002-04-17  Maciej Stachowiak  <mjs at apple.com>
+
+	Reviewed by: Darin Adler  <darin at apple.com>
+
+	* kjs/testkjs.cpp: Don't include <iostream.h> to avoid gcc3
+	warning.
+
 2002-04-15  Darin Adler  <darin at apple.com>
 
 	Reviwed by: Maciej Stachowiak  <mjs at apple.com>
diff --git a/JavaScriptCore/kjs/testkjs.cpp b/JavaScriptCore/kjs/testkjs.cpp
index e1179ec..fbe7f5b 100644
--- a/JavaScriptCore/kjs/testkjs.cpp
+++ b/JavaScriptCore/kjs/testkjs.cpp
@@ -21,7 +21,9 @@
  */
 
 #include <stdio.h>
+#if !APPLE_CHANGES
 #include <iostream.h>
+#endif
 
 #include "value.h"
 #include "object.h"

-- 
WebKit Debian packaging