diff options
author | Dmitry Stogov <dmitry@zend.com> | 2015-01-15 21:09:20 +0300 |
---|---|---|
committer | Dmitry Stogov <dmitry@zend.com> | 2015-01-15 21:09:20 +0300 |
commit | 12cbb9c156cfaef331f75076b8a3ef85797eacc2 (patch) | |
tree | e17585cac282bbf12311f39c06680a4fe658025e /sapi/cli/php_cli.c | |
parent | b476c2713531f6e576acd2513de47c37eea8006f (diff) | |
parent | 29688512b4579fc0f9dcd86587ce0e53855843d6 (diff) | |
download | php-git-12cbb9c156cfaef331f75076b8a3ef85797eacc2.tar.gz |
Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
updated NEWS
updated NEWS
PDO_MySQL: Differentiate between linux and win32 when passing unix_socket
bump year
bump year
Bump year
Diffstat (limited to 'sapi/cli/php_cli.c')
-rw-r--r-- | sapi/cli/php_cli.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c index 74c36d9328..07d7825dc7 100644 --- a/sapi/cli/php_cli.c +++ b/sapi/cli/php_cli.c @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | 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 | @@ -681,7 +681,7 @@ static int do_cli(int argc, char **argv) /* {{{ */ goto out; case 'v': /* show php version & quit */ - php_printf("PHP %s (%s) (built: %s %s) %s\nCopyright (c) 1997-2014 The PHP Group\n%s", + php_printf("PHP %s (%s) (built: %s %s) %s\nCopyright (c) 1997-2015 The PHP Group\n%s", PHP_VERSION, cli_sapi_module.name, __DATE__, __TIME__, #if ZEND_DEBUG && defined(HAVE_GCOV) "(DEBUG GCOV)", |