diff options
author | Lior Kaplan <kaplanlior@gmail.com> | 2016-01-01 19:47:16 +0200 |
---|---|---|
committer | Lior Kaplan <kaplanlior@gmail.com> | 2016-01-01 19:48:25 +0200 |
commit | ed35de784f4ea53927e906ba4af335778de4d16a (patch) | |
tree | 3b95626566e3447a23890e63e8450c1611f26eba /scripts | |
parent | 87958927b0cef17ba06a8739c7febca8e920c6de (diff) | |
parent | 49493a2dcfb2cd1758b69b13d9006ead3be0e066 (diff) | |
download | php-git-ed35de784f4ea53927e906ba4af335778de4d16a.tar.gz |
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Happy new year (Update copyright to 2016)
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/man1/php-config.1.in | 2 | ||||
-rw-r--r-- | scripts/man1/phpize.1.in | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/scripts/man1/php-config.1.in b/scripts/man1/php-config.1.in index ae2ee56bbc..53662a0391 100644 --- a/scripts/man1/php-config.1.in +++ b/scripts/man1/php-config.1.in @@ -65,7 +65,7 @@ PHP version as integer .SH VERSION INFORMATION This manpage describes \fBphp\fP, version @PHP_VERSION@. .SH COPYRIGHT -Copyright \(co 1997\-2014 The PHP Group +Copyright \(co 1997\-2016 The PHP Group .LP 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/scripts/man1/phpize.1.in b/scripts/man1/phpize.1.in index e49adb1b79..07b0dc3495 100644 --- a/scripts/man1/phpize.1.in +++ b/scripts/man1/phpize.1.in @@ -32,7 +32,7 @@ Prints API version information .SH VERSION INFORMATION This manpage describes \fBphp\fP, version @PHP_VERSION@. .SH COPYRIGHT -Copyright \(co 1997\-2014 The PHP Group +Copyright \(co 1997\-2016 The PHP Group .LP 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 |