sixd                                     Thu, 09 Feb 2012 23:53:07 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=323146

Log:
Merge Stas's 5.4 r323128 to trunk

Changed paths:
    U   php/php-src/trunk/php.ini-development
    U   php/php-src/trunk/php.ini-production

Modified: php/php-src/trunk/php.ini-development
===================================================================
--- php/php-src/trunk/php.ini-development       2012-02-09 22:18:50 UTC (rev 
323145)
+++ php/php-src/trunk/php.ini-development       2012-02-09 23:53:07 UTC (rev 
323146)
@@ -424,7 +424,7 @@
 ; development and early testing.
 ;
 ; Error Level Constants:
-; E_ALL             - All errors and warnings (includes E_STRICT as of PHP 
6.0.0)
+; E_ALL             - All errors and warnings (includes E_STRICT as of PHP 
5.4.0)
 ; E_ERROR           - fatal run-time errors
 ; E_RECOVERABLE_ERROR  - almost fatal run-time errors
 ; E_WARNING         - run-time warnings (non-fatal errors)

Modified: php/php-src/trunk/php.ini-production
===================================================================
--- php/php-src/trunk/php.ini-production        2012-02-09 22:18:50 UTC (rev 
323145)
+++ php/php-src/trunk/php.ini-production        2012-02-09 23:53:07 UTC (rev 
323146)
@@ -424,7 +424,7 @@
 ; development and early testing.
 ;
 ; Error Level Constants:
-; E_ALL             - All errors and warnings (includes E_STRICT as of PHP 
6.0.0)
+; E_ALL             - All errors and warnings (includes E_STRICT as of PHP 
5.4.0)
 ; E_ERROR           - fatal run-time errors
 ; E_RECOVERABLE_ERROR  - almost fatal run-time errors
 ; E_WARNING         - run-time warnings (non-fatal errors)

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

Reply via email to