Commit: 99edb55e417aeb7e5a9eaad4eac68a9e074bfc0f Author: Pierrick Charron <pierr...@php.net> Fri, 16 Nov 2012 18:24:42 -0500 Parents: 15ab75be8ad014c6fff5f2b908824ef18150a7ea c886691100eb554c01f14b69bd142e21c84ae6f6 Branches: PHP-5.4 PHP-5.5 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=99edb55e417aeb7e5a9eaad4eac68a9e074bfc0f Log: Merge branch 'PHP-5.3' into PHP-5.4 * PHP-5.3: 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 94c48c8,b713163..a481cbd --- 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:48:25 2012 */ -/* Generated by re2c 0.13.5 on Fri Nov 16 17:44:02 2012 */ ++/* Generated by re2c 0.13.5 on Fri Nov 16 18:24:06 2012 */ #line 1 "Zend/zend_ini_scanner.l" /* +----------------------------------------------------------------------+ diff --cc Zend/zend_ini_scanner_defs.h index 0c04713,50a5aea..1fe4c0c --- 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:48:25 2012 */ -/* Generated by re2c 0.13.5 on Fri Nov 16 17:44:02 2012 */ ++/* Generated by re2c 0.13.5 on Fri Nov 16 18:24:06 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
