ChangeLog update

diff --git a/ChangeLog b/ChangeLog
index 9e42d136d494e4773cc0e0cbf76fde71ecb1cb44..6a8b13429e44dad1452fb509cf0bde99668796a8 100644 (file)
--- 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 14f7eaac0dcaab5462c838395dc0c9936ca4d6b8..3ae3f8072a15efd609dac7393cc2d8cd2a56e2aa 100644 (file)
--- 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: