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
13 years ago · 99edb55e41
2 changed files with 1335 additions and 1349 deletions
--- a/Zend/zend_ini_scanner.c
+++ b/Zend/zend_ini_scanner.c
--- a/Zend/zend_ini_scanner_defs.h
+++ b/Zend/zend_ini_scanner_defs.h
@ -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 18:24:06 2012 */
 #line 3 "Zend/zend_ini_scanner_defs.h"

 enum YYCONDTYPE {