diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2012-11-14 18:03:38 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2012-11-14 18:03:38 +0400 |
| commit | ba8a06fd95ed4bce920569b4c9f8e71f927bd498 (patch) | |
| tree | 39b836486123e14c8e44d42cab9adf1bb08df95b /Zend/zend_language_scanner_defs.h | |
| parent | e73beb82dfec93e4e196604107355b21bb2f166e (diff) | |
| parent | f99befadbd7f9896558ec2c3640c8e028ac09b1f (diff) | |
| download | php-git-ba8a06fd95ed4bce920569b4c9f8e71f927bd498.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fixed compiler reenterability
Fixed compiler reenterability
Conflicts:
Zend/zend_language_scanner.c
Zend/zend_language_scanner_defs.h
Diffstat (limited to 'Zend/zend_language_scanner_defs.h')
| -rw-r--r-- | Zend/zend_language_scanner_defs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_language_scanner_defs.h b/Zend/zend_language_scanner_defs.h index 47df7e92de..de220af71b 100644 --- a/Zend/zend_language_scanner_defs.h +++ b/Zend/zend_language_scanner_defs.h @@ -1,4 +1,4 @@ -/* Generated by re2c 0.13.5 on Mon Aug 20 13:34:50 2012 */ +/* Generated by re2c 0.13.5 on Wed Nov 14 17:50:16 2012 */ #line 3 "Zend/zend_language_scanner_defs.h" enum YYCONDTYPE { |