diff options
| author | Rasmus Lerdorf <rasmus@php.net> | 2009-02-14 21:08:02 +0000 |
|---|---|---|
| committer | Rasmus Lerdorf <rasmus@php.net> | 2009-02-14 21:08:02 +0000 |
| commit | 70ecb3074a707a7c19b0900fc7bbac02a5b30149 (patch) | |
| tree | 3eff3dea43665712fcc6a822c18549b1fc5bed08 /Zend/zend_language_scanner_defs.h | |
| parent | ca63494a395845ca794140c03464ae037740182c (diff) | |
| download | php-git-70ecb3074a707a7c19b0900fc7bbac02a5b30149.tar.gz | |
2.4.1 is safe
Diffstat (limited to 'Zend/zend_language_scanner_defs.h')
| -rw-r--r-- | Zend/zend_language_scanner_defs.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Zend/zend_language_scanner_defs.h b/Zend/zend_language_scanner_defs.h index e3d556fdaf..6b18749ea3 100644 --- a/Zend/zend_language_scanner_defs.h +++ b/Zend/zend_language_scanner_defs.h @@ -1,4 +1,12 @@ +<<<<<<< zend_language_scanner_defs.h +<<<<<<< zend_language_scanner_defs.h +/* Generated by re2c 0.13.5 on Fri Aug 29 13:01:13 2008 */ +======= +/* Generated by re2c 0.13.6.dev on Tue Nov 4 01:40:34 2008 */ +>>>>>>> 1.1.2.20 +======= /* Generated by re2c 0.13.5 on Fri Jan 9 12:08:49 2009 */ +>>>>>>> 1.1.2.21 #line 3 "Zend/zend_language_scanner_defs.h" enum YYCONDTYPE { |