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 /win32 | |
| 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 'win32')
| -rw-r--r-- | win32/build/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/win32/build/Makefile b/win32/build/Makefile index 28e317edab..19ee82e7b9 100644 --- a/win32/build/Makefile +++ b/win32/build/Makefile @@ -1,7 +1,7 @@ # +----------------------------------------------------------------------+ # | PHP Version 7 | # +----------------------------------------------------------------------+ -# | Copyright (c) 1997-2008 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 | |