diff options
| author | Xinchen Hui <laruence@php.net> | 2012-09-05 23:11:19 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2012-09-05 23:11:19 +0800 |
| commit | 9d44ff640c1def1dc05b298dab77b2d2c9da2f38 (patch) | |
| tree | bc2dd089bc5c62fcfb22ddfc23c8e3732a08f880 /ext/dba/libflatfile | |
| parent | 954e7a3b3ca115b619b1b326ae4ae31a7cf196db (diff) | |
| parent | d64d9e335147173507d39c759c54320e2c20c9ed (diff) | |
| download | php-git-9d44ff640c1def1dc05b298dab77b2d2c9da2f38.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
Conflicts:
ext/interbase/interbase.rc
Diffstat (limited to 'ext/dba/libflatfile')
| -rw-r--r-- | ext/dba/libflatfile/flatfile.c | 2 | ||||
| -rw-r--r-- | ext/dba/libflatfile/flatfile.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ext/dba/libflatfile/flatfile.c b/ext/dba/libflatfile/flatfile.c index bf851847d5..c17a295438 100644 --- a/ext/dba/libflatfile/flatfile.c +++ b/ext/dba/libflatfile/flatfile.c @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 5 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2010 The PHP Group | + | Copyright (c) 1997-2012 The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | diff --git a/ext/dba/libflatfile/flatfile.h b/ext/dba/libflatfile/flatfile.h index e7ce3a7640..65d099fbc7 100644 --- a/ext/dba/libflatfile/flatfile.h +++ b/ext/dba/libflatfile/flatfile.h @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 5 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2010 The PHP Group | + | Copyright (c) 1997-2012 The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | |