Commit: 8c97c79d77f968318113a99a3c560de4366a2643 Author: Pierrick Charron <pierr...@php.net> Fri, 16 Nov 2012 18:28:04 -0500 Parents: 30d659144a069da7de78b8740f429316c085c99e 99edb55e417aeb7e5a9eaad4eac68a9e074bfc0f Branches: PHP-5.5 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=8c97c79d77f968318113a99a3c560de4366a2643 Log: Merge branch 'PHP-5.4' into PHP-5.5 * PHP-5.4: Regenerate Zend ini scanner Conflicts: Zend/zend_ini_scanner.c Zend/zend_ini_scanner_defs.h Changed paths: MM Zend/zend_ini_scanner.c MM Zend/zend_ini_scanner_defs.h Diff: diff --cc Zend/zend_ini_scanner.c index 470f5236,a481cbd..1c7f306 --- a/Zend/zend_ini_scanner.c +++ b/Zend/zend_ini_scanner.c @@@ -1,4 -1,4 +1,4 @@@ - /* Generated by re2c 0.13.5 on Thu Jun 7 17:55:40 2012 */ -/* Generated by re2c 0.13.5 on Fri Nov 16 18:24:06 2012 */ ++/* Generated by re2c 0.13.5 on Fri Nov 16 18:27:25 2012 */ #line 1 "Zend/zend_ini_scanner.l" /* +----------------------------------------------------------------------+ diff --cc Zend/zend_ini_scanner_defs.h index 9c99cc4,1fe4c0c..b985f34 --- a/Zend/zend_ini_scanner_defs.h +++ b/Zend/zend_ini_scanner_defs.h @@@ -1,4 -1,4 +1,4 @@@ - /* Generated by re2c 0.13.5 on Thu Jun 7 17:55:41 2012 */ -/* Generated by re2c 0.13.5 on Fri Nov 16 18:24:06 2012 */ ++/* Generated by re2c 0.13.5 on Fri Nov 16 18:27:25 2012 */ #line 3 "Zend/zend_ini_scanner_defs.h" enum YYCONDTYPE { -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
