summaryrefslogtreecommitdiff
path: root/Zend/zend_string.h
diff options
context:
space:
mode:
authorJakub Zelenka <bukka@php.net>2016-01-06 14:43:07 +0000
committerJakub Zelenka <bukka@php.net>2016-01-06 14:43:07 +0000
commitae0ce19fa86377e5ab230ab9dca8f8dbd9826fd7 (patch)
tree360c977fa1f03c2db397743988cd003e2321e44c /Zend/zend_string.h
parent55abb5d39501ca0fa9bc704198785b1f98c95bb2 (diff)
parent7302b72d6e6bb77446599ec29a3b89702a506025 (diff)
downloadphp-git-ae0ce19fa86377e5ab230ab9dca8f8dbd9826fd7.tar.gz
Merge branch 'master' into openssl_aead
Diffstat (limited to 'Zend/zend_string.h')
-rw-r--r--Zend/zend_string.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_string.h b/Zend/zend_string.h
index 9c022e8b89..722fc3ae46 100644
--- a/Zend/zend_string.h
+++ b/Zend/zend_string.h
@@ -2,7 +2,7 @@
+----------------------------------------------------------------------+
| Zend Engine |
+----------------------------------------------------------------------+
- | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+ | Copyright (c) 1998-2016 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 |