diff options
| author | Julien Pauli <jpauli@php.net> | 2016-01-04 18:13:38 +0100 |
|---|---|---|
| committer | Julien Pauli <jpauli@php.net> | 2016-01-04 18:13:38 +0100 |
| commit | 736b91c6507b196e9ddd84aba3f98ee7ed66c63d (patch) | |
| tree | 91e52c4f21d6557500f52d1358203324050bf942 /scripts | |
| parent | 0ea63cb2a8512dbd1f6d7d8b171a626f5c10b2c6 (diff) | |
| parent | 53fb2f1e5c6037a5182c2e0dcd5bac7ecdb7c150 (diff) | |
| download | php-git-736b91c6507b196e9ddd84aba3f98ee7ed66c63d.tar.gz | |
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Happy new year (Update copyright to 2016)
Conflicts:
ext/json/php_json_encoder.h
sapi/continuity/capi.c
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 53662a0391..d9fa4b0985 100644 --- a/scripts/man1/php-config.1.in +++ b/scripts/man1/php-config.1.in @@ -1,4 +1,4 @@ -.TH @program_prefix@php\-config 1 "2014" "The PHP Group" "Scripting Language" +.TH @program_prefix@php\-config 1 "2016" "The PHP Group" "Scripting Language" .SH NAME @program_prefix@php\-config \- get information about PHP configuration and compile options .SH SYNOPSIS diff --git a/scripts/man1/phpize.1.in b/scripts/man1/phpize.1.in index 07b0dc3495..66c3c352f0 100644 --- a/scripts/man1/phpize.1.in +++ b/scripts/man1/phpize.1.in @@ -1,4 +1,4 @@ -.TH @program_prefix@phpize 1 "2014" "The PHP Group" "Scripting Language" +.TH @program_prefix@phpize 1 "2016" "The PHP Group" "Scripting Language" .SH NAME @program_prefix@phpize \- prepare a PHP extension for compiling .SH SYNOPSIS |