Skip to content

Commit

Permalink
Merge branch 'PHP-5.5'
Browse files Browse the repository at this point in the history
  • Loading branch information
sebastianbergmann committed Dec 6, 2012
2 parents 6fc2eca + 8ca4288 commit 4f4262e
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Zend/zend_ini_scanner.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Generated by re2c 0.13.5 on Fri Nov 16 18:27:25 2012 */
/* Generated by re2c 0.13.5 */
#line 1 "Zend/zend_ini_scanner.l"
/*
+----------------------------------------------------------------------+
Expand Down
2 changes: 1 addition & 1 deletion Zend/zend_ini_scanner_defs.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Generated by re2c 0.13.5 on Fri Nov 16 18:27:25 2012 */
/* Generated by re2c 0.13.5 */
#line 3 "Zend/zend_ini_scanner_defs.h"

enum YYCONDTYPE {
Expand Down
2 changes: 1 addition & 1 deletion Zend/zend_language_scanner.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Generated by re2c 0.13.5 on Wed Nov 14 18:04:29 2012 */
/* Generated by re2c 0.13.5 */
#line 1 "Zend/zend_language_scanner.l"
/*
+----------------------------------------------------------------------+
Expand Down
2 changes: 1 addition & 1 deletion Zend/zend_language_scanner_defs.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Generated by re2c 0.13.5 on Wed Nov 14 18:04:29 2012 */
/* Generated by re2c 0.13.5 */
#line 3 "Zend/zend_language_scanner_defs.h"

enum YYCONDTYPE {
Expand Down

0 comments on commit 4f4262e

Please sign in to comment.