From 5d2b6c784e4a70137fb7b186254cbc83815c8581 Mon Sep 17 00:00:00 2001
From:  <changelog@php.net>
Date: Thu, 16 Dec 2004 01:35:24 +0000
Subject: [PATCH] ChangeLog update

---
 ChangeLog      | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
 Zend/ChangeLog | 18 ++++++++++++++++++
 2 files changed, 66 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index c6efac72b46..d124e5c2830 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,51 @@
+2004-12-15  Frank M. Kromann  <frank@kromann.info>
+
+    * ext/ming/ming.c:
+      Adding missing zend_list_addref() and make SWFShape::drawArc() work
+
+2004-12-15  Ilia Alshanetsky  <ilia@prohost.org>
+
+    * (PHP_4_3)
+      NEWS
+      configure.in
+      main/php_version.h:
+      Back to dev.
+
+2004-12-15  Andi Gutmans  <andi@zend.com>
+
+    * (PHP_5_0)
+      NEWS
+      configure.in
+      ZendEngine2/zend.h
+      main/php_version.h:
+      - 5.0.4-dev
+
+    * (PHP_5_0)
+      NEWS
+      configure.in
+      ZendEngine2/zend.h
+      main/php_version.h:
+      - Redo 5.0.3
+
+    * (PHP_5_0)
+      NEWS
+      configure.in
+      ZendEngine2/zend.h
+      main/php_version.h:
+      - Back to -dev
+
+    * (PHP_5_0)
+      NEWS
+      configure.in
+      ZendEngine2/zend.h
+      main/php_version.h:
+      - Roll PHP 5.0.3
+
+2004-12-15  Jani Taskinen  <jani.taskinen@kolumbus.fi>
+
+    * ext/iconv/.cvsignore:
+      missing files
+
 2004-12-14  Ilia Alshanetsky  <ilia@prohost.org>
 
     * ext/standard/tests/math/bug28228.phpt
diff --git a/Zend/ChangeLog b/Zend/ChangeLog
index 6676370ac49..85f9286eda1 100644
--- a/Zend/ChangeLog
+++ b/Zend/ChangeLog
@@ -1,3 +1,21 @@
+2004-12-15  Andi Gutmans  <andi@zend.com>
+
+    * (PHP_5_0)
+      zend.h:
+      - 5.0.4-dev
+
+    * (PHP_5_0)
+      zend.h:
+      - Redo 5.0.3
+
+    * (PHP_5_0)
+      zend.h:
+      - Back to -dev
+
+    * (PHP_5_0)
+      zend.h:
+      - Roll PHP 5.0.3
+
 2004-12-14  Derick Rethans  <php@derickrethans.nl>
 
     * zend_strtod.c