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 /ext | |
| 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 'ext')
| -rw-r--r-- | ext/mysqli/mysqli_mysqlnd.h | 2 | ||||
| -rw-r--r-- | ext/phar/phar.1.in | 2 | ||||
| -rw-r--r-- | ext/standard/dns_win32.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/ext/mysqli/mysqli_mysqlnd.h b/ext/mysqli/mysqli_mysqlnd.h index a1656e59eb..099d80871c 100644 --- a/ext/mysqli/mysqli_mysqlnd.h +++ b/ext/mysqli/mysqli_mysqlnd.h @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 7 | +----------------------------------------------------------------------+ - | Copyright (c) 2006-2009 The PHP Group | + | Copyright (c) 2006-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/ext/phar/phar.1.in b/ext/phar/phar.1.in index eec98fd3b0..46eed77e24 100644 --- a/ext/phar/phar.1.in +++ b/ext/phar/phar.1.in @@ -1,4 +1,4 @@ -.TH PHAR 1 "2013" "The PHP Group" "User Commands" +.TH PHAR 1 "2016" "The PHP Group" "User Commands" .SH NAME phar, phar.phar \- PHAR (PHP archive) command line tool .SH SYNOPSIS diff --git a/ext/standard/dns_win32.c b/ext/standard/dns_win32.c index 00908b722f..22c606eb0a 100644 --- a/ext/standard/dns_win32.c +++ b/ext/standard/dns_win32.c @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 7 | +----------------------------------------------------------------------+ - | Copyright (c) 2008-2009 The PHP Group | + | Copyright (c) 2008-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 | |