diff options
| author | Jakub Zelenka <bukka@php.net> | 2015-01-25 18:43:15 +0000 |
|---|---|---|
| committer | Jakub Zelenka <bukka@php.net> | 2015-01-25 18:43:15 +0000 |
| commit | 3159d518d0c60dcb796b34f86b21593c7a728897 (patch) | |
| tree | 05cb0211c7607595299bce7463257c0af9e5786b /ext/json/json_parser.y | |
| parent | 3ddb5993ddcf0cb76a7f8900bfb2a6bcdc497302 (diff) | |
| parent | df984ad4f5e4e53e3f8bdafc7d620fd8112a121c (diff) | |
| download | php-git-3159d518d0c60dcb796b34f86b21593c7a728897.tar.gz | |
Merge branch 'master' into jsond
Conflicts:
ext/json/JSON_parser.c
ext/json/json.c
Diffstat (limited to 'ext/json/json_parser.y')
| -rw-r--r-- | ext/json/json_parser.y | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/json/json_parser.y b/ext/json/json_parser.y index 1de6d6c747..72f2890f6f 100644 --- a/ext/json/json_parser.y +++ b/ext/json/json_parser.y @@ -3,7 +3,7 @@ +----------------------------------------------------------------------+ | PHP Version 5 | +----------------------------------------------------------------------+ - | 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 | |