summaryrefslogtreecommitdiff
path: root/ext/mysql/php_mysql.c
diff options
context:
space:
mode:
authorDmitry Stogov <dmitry@zend.com>2015-01-15 21:09:20 +0300
committerDmitry Stogov <dmitry@zend.com>2015-01-15 21:09:20 +0300
commit12cbb9c156cfaef331f75076b8a3ef85797eacc2 (patch)
treee17585cac282bbf12311f39c06680a4fe658025e /ext/mysql/php_mysql.c
parentb476c2713531f6e576acd2513de47c37eea8006f (diff)
parent29688512b4579fc0f9dcd86587ce0e53855843d6 (diff)
downloadphp-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 'ext/mysql/php_mysql.c')
-rw-r--r--ext/mysql/php_mysql.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c
index 001e7fb228..39fc304320 100644
--- a/ext/mysql/php_mysql.c
+++ b/ext/mysql/php_mysql.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 |