summaryrefslogtreecommitdiff
path: root/Zend/zend_object_handlers.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 /Zend/zend_object_handlers.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 'Zend/zend_object_handlers.c')
-rw-r--r--Zend/zend_object_handlers.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_object_handlers.c b/Zend/zend_object_handlers.c
index c1e8a54539..796dd50396 100644
--- a/Zend/zend_object_handlers.c
+++ b/Zend/zend_object_handlers.c
@@ -2,7 +2,7 @@
+----------------------------------------------------------------------+
| Zend Engine |
+----------------------------------------------------------------------+
- | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
+ | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+----------------------------------------------------------------------+
| This source file is subject to version 2.00 of the Zend license, |
| that is bundled with this package in the file LICENSE, and is |