diff options
| author | Xinchen Hui <laruence@gmail.com> | 2016-01-02 17:48:20 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2016-01-02 17:48:20 +0800 |
| commit | d9bac84220b1eb4aa06af959870621adb57d1e02 (patch) | |
| tree | b829abb8c13efcd5ce426d1ed3e577b9d5e22bd9 | |
| parent | a7b1ea3c84524a335a2f7a3bfd7ff55633d62dbf (diff) | |
| parent | c51e73c803059d638e8bc9868f122cddf396516e (diff) | |
| download | php-git-d9bac84220b1eb4aa06af959870621adb57d1e02.tar.gz | |
Merge branch 'PHP-5.6' of https://github.com/kaplanlior/php-src into PHP-5.6
| -rw-r--r-- | TSRM/tsrm_nw.c | 2 | ||||
| -rw-r--r-- | TSRM/tsrm_nw.h | 2 | ||||
| -rw-r--r-- | TSRM/tsrm_win32.c | 2 | ||||
| -rw-r--r-- | TSRM/tsrm_win32.h | 2 | ||||
| -rw-r--r-- | Zend/zend_virtual_cwd.c | 2 | ||||
| -rw-r--r-- | Zend/zend_virtual_cwd.h | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/TSRM/tsrm_nw.c b/TSRM/tsrm_nw.c index 7611b5d1ce..367e4ac82e 100644 --- a/TSRM/tsrm_nw.c +++ b/TSRM/tsrm_nw.c @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 5 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2015 The PHP Group | + | Copyright (c) 1997-2016 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/TSRM/tsrm_nw.h b/TSRM/tsrm_nw.h index a67431ee92..ab90bc1ff0 100644 --- a/TSRM/tsrm_nw.h +++ b/TSRM/tsrm_nw.h @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 5 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2015 The PHP Group | + | Copyright (c) 1997-2016 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/TSRM/tsrm_win32.c b/TSRM/tsrm_win32.c index 6c4462d63a..06e4561f92 100644 --- a/TSRM/tsrm_win32.c +++ b/TSRM/tsrm_win32.c @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 5 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2015 The PHP Group | + | Copyright (c) 1997-2016 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/TSRM/tsrm_win32.h b/TSRM/tsrm_win32.h index 8acfb9fda5..7be4dcb0c0 100644 --- a/TSRM/tsrm_win32.h +++ b/TSRM/tsrm_win32.h @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 5 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2015 The PHP Group | + | Copyright (c) 1997-2016 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/Zend/zend_virtual_cwd.c b/Zend/zend_virtual_cwd.c index c38c3bea84..32d6ab8f85 100644 --- a/Zend/zend_virtual_cwd.c +++ b/Zend/zend_virtual_cwd.c @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 5 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2015 The PHP Group | + | Copyright (c) 1997-2016 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/Zend/zend_virtual_cwd.h b/Zend/zend_virtual_cwd.h index 1603815178..86c93153c5 100644 --- a/Zend/zend_virtual_cwd.h +++ b/Zend/zend_virtual_cwd.h @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 5 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2015 The PHP Group | + | Copyright (c) 1997-2016 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 | |