Permalink
Browse files

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
  • Loading branch information...
2 parents 15ab75b + c886691 commit 99edb55e417aeb7e5a9eaad4eac68a9e074bfc0f @adoy adoy committed Nov 16, 2012
Showing with 1,335 additions and 1,349 deletions.
  1. +1,334 −1,348 Zend/zend_ini_scanner.c
  2. +1 −1 Zend/zend_ini_scanner_defs.h
View
@@ -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 {

0 comments on commit 99edb55

Please sign in to comment.