edink           Thu Dec 26 21:55:37 2002 EDT

  Modified files:              
    /php4       NEWS 
  Log:
  Resolved apperent cvs commit confict.
  
  
Index: php4/NEWS
diff -u php4/NEWS:1.1288 php4/NEWS:1.1289
--- php4/NEWS:1.1288    Thu Dec 26 20:32:47 2002
+++ php4/NEWS   Thu Dec 26 21:55:37 2002
@@ -1,14 +1,11 @@
 PHP 4                                                                      NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ? ? ??? 200?, Version 4.4.0
-<<<<<<< NEWS
 - Make uniqid() parameters optional and allow any prefix length. (Marcus)
-=======
 - New range() functionality
   . Support for float modifier.
   . Detection of numeric values inside strings passed as high & low.
   . Proper handle the situations where high == low.
->>>>>>> 1.1286
 - Let array_search() accept objects as a needle under ZendEngine2. (Moriyoshi)
 - Fixed bug #20442 (upgraded bundled expat to 1.95.5). (Ilia)
 - Added imagefilter() function which allows application of various filters.



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to