diff options
| author | Rasmus Lerdorf <rasmus@php.net> | 2009-02-14 21:20:16 +0000 |
|---|---|---|
| committer | Rasmus Lerdorf <rasmus@php.net> | 2009-02-14 21:20:16 +0000 |
| commit | 8eea99840626da8476b6bec37514085081ba3c81 (patch) | |
| tree | c990b9c48537acf5d6596eb9f7b1aa2f66c1790d /Zend/zend_ini_scanner.c | |
| parent | 70ecb3074a707a7c19b0900fc7bbac02a5b30149 (diff) | |
| download | php-git-8eea99840626da8476b6bec37514085081ba3c81.tar.gz | |
Unmangle
Diffstat (limited to 'Zend/zend_ini_scanner.c')
| -rw-r--r-- | Zend/zend_ini_scanner.c | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/Zend/zend_ini_scanner.c b/Zend/zend_ini_scanner.c index d3044f3dfe..468e8d51cc 100644 --- a/Zend/zend_ini_scanner.c +++ b/Zend/zend_ini_scanner.c @@ -1,16 +1,4 @@ -<<<<<<< zend_ini_scanner.c -<<<<<<< zend_ini_scanner.c -<<<<<<< zend_ini_scanner.c -/* Generated by re2c 0.13.5 on Fri Aug 29 13:01:39 2008 */ -======= -/* Generated by re2c 0.13.5 on Wed Sep 10 18:54:04 2008 */ ->>>>>>> 1.1.2.10 -======= -/* Generated by re2c 0.13.5 on Wed Nov 5 22:35:51 2008 */ ->>>>>>> 1.1.2.12 -======= /* Generated by re2c 0.13.6.dev on Mon Feb 2 19:23:18 2009 */ ->>>>>>> 1.1.2.15 #line 1 "Zend/zend_ini_scanner.l" /* +----------------------------------------------------------------------+ @@ -34,19 +22,7 @@ +----------------------------------------------------------------------+ */ -<<<<<<< zend_ini_scanner.c -<<<<<<< zend_ini_scanner.c -<<<<<<< zend_ini_scanner.c /* $Id$ */ -======= -/* $Id$ */ ->>>>>>> 1.1.2.10 -======= -/* $Id$ */ ->>>>>>> 1.1.2.12 -======= -/* $Id$ */ ->>>>>>> 1.1.2.15 #include <errno.h> #include "zend.h" |