]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorReeze Xia <reeze@php.net>
Sun, 1 Mar 2015 07:15:03 +0000 (15:15 +0800)
committerReeze Xia <reeze@php.net>
Sun, 1 Mar 2015 07:15:03 +0000 (15:15 +0800)
* PHP-5.6:
  Bump header year
  Update NEWS

Conflicts:
NEWS

1  2 
header

diff --cc header
index 1d22bbb0b1f965e1b8585569417008c518710781,c54286c8bf21b8035b5857e5951a89259ce08dee..bd442cbb61fdbd4df8b68e9150e729a6616bb538
--- 1/header
--- 2/header
+++ b/header
@@@ -1,8 -1,8 +1,8 @@@
  /*
    +----------------------------------------------------------------------+
 -  | PHP Version 5                                                        |
 +  | PHP Version 7                                                        |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2014 The PHP Group                                |
+   | Copyright (c) 1997-2015 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        |