diff options
author | Christopher Jones <christopher.jones@oracle.com> | 2016-04-14 15:09:02 +1000 |
---|---|---|
committer | Christopher Jones <christopher.jones@oracle.com> | 2016-04-14 15:09:02 +1000 |
commit | 96ece22a058e48f82ea49f1f34b8c6110dbae28b (patch) | |
tree | 639fc5fafcf71badbb137f4f2fb64e9383b440bd | |
parent | 12cd25bb1a589f8a49a0cca9290e589f1dc01875 (diff) | |
parent | d1e81a59a7d174ffeb3e69aed9f8b1a6bbd129e2 (diff) | |
download | php-git-96ece22a058e48f82ea49f1f34b8c6110dbae28b.tar.gz |
Merge branch 'PHP-5.6' into PHP-7.0
-rw-r--r-- | ext/oci8/oci8_dtrace.d | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/oci8/oci8_dtrace.d b/ext/oci8/oci8_dtrace.d index 30c98de912..c8b5dfcfc3 100644 --- a/ext/oci8/oci8_dtrace.d +++ b/ext/oci8/oci8_dtrace.d @@ -4,11 +4,11 @@ +----------------------------------------------------------------------+ | Copyright (c) 2013 Zend Technologies Ltd. (http://www.zend.com) | +----------------------------------------------------------------------+ - | This source file is subject to version 3.01 of the Zend license, | + | 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 | | available through the world-wide-web at the following url: | - | http://www.zend.com/license/3_01.txt. | - | If you did not receive a copy of the Zend license and are unable to | + | http://www.php.net/license/3_01.txt. | + | If you did not receive a copy of the PHP license and are unable to | | obtain it through the world-wide-web, please send a note to | | license@zend.com so we can mail you a copy immediately. | +----------------------------------------------------------------------+ |