[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog

[changelog]

changelog               Sat Jan 10 20:32:20 2004 EDT

  Modified files:              
    /ZendEngine2        ChangeLog 
  Log:
  ChangeLog update
  
Index: ZendEngine2/ChangeLog
diff -u ZendEngine2/ChangeLog:1.380 ZendEngine2/ChangeLog:1.381
--- ZendEngine2/ChangeLog:1.380 Fri Jan  9 20:33:36 2004
+++ ZendEngine2/ChangeLog       Sat Jan 10 20:32:20 2004
@@ -1,3 +1,15 @@
+2004-01-10  Zeev Suraski  <[EMAIL PROTECTED]>
+
+    * zend_operators.c:
+      Remove conflict
+
+    * zend_builtin_functions.c
+      zend_execute_API.c
+      zend_globals.h
+      zend_operators.c:
+      Added error mask to set_error_handler()
+      Patch by Christian Schneider <[EMAIL PROTECTED]>
+
 2004-01-09  Wez Furlong  <[EMAIL PROTECTED]>
 
     * acconfig.h:
@@ -2798,7 +2810,7 @@
 2003-06-10  Jani Taskinen  <[EMAIL PROTECTED]>
 
     * zend_multiply.h:
-      - Missing $Id: ChangeLog,v 1.380 2004/01/10 01:33:36 changelog Exp $ tag
+      - Missing $Id: ChangeLog,v 1.381 2004/01/11 01:32:20 changelog Exp $ tag
 
 2003-06-10  James Cox  <[EMAIL PROTECTED]>
 
@@ -4522,7 +4534,7 @@
       zend_types.h
       zend_variables.c
       zend_variables.h:
-      - Added some missing CVS $Id: ChangeLog,v 1.380 2004/01/10 01:33:36 changelog 
Exp $ tags, headers and footers.
+      - Added some missing CVS $Id: ChangeLog,v 1.381 2004/01/11 01:32:20 changelog 
Exp $ tags, headers and footers.
 
 2003-01-30  Ilia Alshanetsky  <[EMAIL PROTECTED]>