From:  <changelog@php.net>
Date: Sun, 12 Jun 2005 05:40:34 +0000 (+0000)
Subject: ChangeLog update
X-Git-Tag: php-5.1.0b2~226
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=88141e3ed01e8d4b1d1c4746197f3567549e5f24;p=php

ChangeLog update
---

diff --git a/ChangeLog b/ChangeLog
index 9e42d136d4..6a8b13429e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,41 @@
+2005-06-11  Jani Taskinen  <jani.taskinen@sci.fi>
+
+    * (PHP_4_4)
+      ext/standard/url_scanner_ex.c
+      ext/standard/var_unserializer.c:
+      Revert. re2c 0.9.7 obviously does not work properly (or our .re files are
+      buggy)
+
+    * ext/standard/url_scanner_ex.c
+      ext/standard/var_unserializer.c:
+      revert
+
+    * ext/mysql/config.m4:
+      Another netware fix
+
+    * NEWS:
+      Merge the bug fix entries from PHP_5_0 branch
+
+    * ext/standard/url_scanner_ex.c
+      ext/standard/url_scanner_ex.c
+      ext/standard/var_unserializer.c
+      ext/standard/var_unserializer.c:
+      regenerated with re2c 0.9.7
+
+2005-06-11  Andi Gutmans  <andi@zend.com>
+
+    * configure.in
+      ZendEngine2/zend.h
+      main/php_version.h:
+      - Back to -dev
+
+    * (php_5_1_0b2)
+      NEWS
+      configure.in
+      ZendEngine2/zend.h
+      main/php_version.h:
+      - b2 (will post it to internals@)
+
 2005-06-10  Andi Gutmans  <andi@zend.com>
 
     * configure.in
diff --git a/Zend/ChangeLog b/Zend/ChangeLog
index 14f7eaac0d..3ae3f8072a 100644
--- a/Zend/ChangeLog
+++ b/Zend/ChangeLog
@@ -1,3 +1,12 @@
+2005-06-11  Andi Gutmans  <andi@zend.com>
+
+    * zend.h:
+      - Back to -dev
+
+    * (php_5_1_0b2)
+      zend.h:
+      - b2 (will post it to internals@)
+
 2005-06-10  Andi Gutmans  <andi@zend.com>
 
     * zend.h: