From c4435ad7b2fd4101ba1898c52ee2a0f61fe70f64 Mon Sep 17 00:00:00 2001
From:  <changelog@php.net>
Date: Thu, 15 Apr 2004 00:35:44 +0000
Subject: [PATCH] ChangeLog update

---
 ChangeLog      | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++
 Zend/ChangeLog | 12 ++++++++++
 2 files changed, 71 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 731e574796..fe04dde600 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,62 @@
+2004-04-14  Marcus Boerger  <marcus.boerger@post.rwth-aachen.de>
+
+    * NEWS:
+      BFN
+
+2004-04-14  Ilia Alshanetsky  <ilia@prohost.org>
+
+    * (PHP_4_3)
+      NEWS
+      ext/gd/libgd/gd.c:
+      Fixed bug #27995 (imagefilltoborder() stops the fill process prematurely).
+      
+
+2004-04-14  Andi Gutmans  <andi@zend.com>
+
+    * ZendEngine2/zend_extensions.h:
+      - Add comment
+
+2004-04-14  Ilia Alshanetsky  <ilia@prohost.org>
+
+    * (PHP_4_3)
+      configure.in
+      main/php_version.h:
+      Back to dev.
+
+    * (PHP_4_3)
+      configure.in
+      main/php_version.h:
+      Prepare for 4.3.6
+
+2004-04-14  Edin Kadribasic  <edink@emini.dk>
+
+    * (PHP_4_3)
+      NEWS:
+      News update
+
+    * ext/bz2/config.w32:
+      According to Wez, this is not needed.
+      It also breaks win32 build.
+
+2004-04-14  Andi Gutmans  <andi@zend.com>
+
+    * configure.in
+      ZendEngine2/zend.h
+      main/php_version.h:
+      - RC2-dev
+
+    * (php_5_0_0RC2RC1)
+      configure.in
+      ZendEngine2/zend.h
+      main/php_version.h:
+      - RC2RC1
+
+2004-04-14  Derick Rethans  <php@derickrethans.nl>
+
+    * (php_5_0_0RC2RC1)
+      ext/iconv/config.m4:
+      - Enable iconv by default
+
 2004-04-13  Marcus Boerger  <marcus.boerger@post.rwth-aachen.de>
 
     * ZendEngine2/zend_exceptions.c:
diff --git a/Zend/ChangeLog b/Zend/ChangeLog
index e0e4bfcb18..7c84a38ee4 100644
--- a/Zend/ChangeLog
+++ b/Zend/ChangeLog
@@ -1,3 +1,15 @@
+2004-04-14  Andi Gutmans  <andi@zend.com>
+
+    * zend_extensions.h:
+      - Add comment
+
+    * zend.h:
+      - RC2-dev
+
+    * (php_5_0_0RC2RC1)
+      zend.h:
+      - RC2RC1
+
 2004-04-13  Marcus Boerger  <marcus.boerger@post.rwth-aachen.de>
 
     * zend_exceptions.c:
-- 
2.40.0