diff options
| author | Lior Kaplan <kaplanlior@gmail.com> | 2016-01-01 19:47:16 +0200 |
|---|---|---|
| committer | Lior Kaplan <kaplanlior@gmail.com> | 2016-01-01 19:48:25 +0200 |
| commit | ed35de784f4ea53927e906ba4af335778de4d16a (patch) | |
| tree | 3b95626566e3447a23890e63e8450c1611f26eba /ext/pdo_oci | |
| parent | 87958927b0cef17ba06a8739c7febca8e920c6de (diff) | |
| parent | 49493a2dcfb2cd1758b69b13d9006ead3be0e066 (diff) | |
| download | php-git-ed35de784f4ea53927e906ba4af335778de4d16a.tar.gz | |
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Happy new year (Update copyright to 2016)
Diffstat (limited to 'ext/pdo_oci')
| -rw-r--r-- | ext/pdo_oci/oci_driver.c | 2 | ||||
| -rw-r--r-- | ext/pdo_oci/oci_statement.c | 2 | ||||
| -rw-r--r-- | ext/pdo_oci/pdo_oci.c | 2 | ||||
| -rw-r--r-- | ext/pdo_oci/php_pdo_oci.h | 2 | ||||
| -rw-r--r-- | ext/pdo_oci/php_pdo_oci_int.h | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/ext/pdo_oci/oci_driver.c b/ext/pdo_oci/oci_driver.c index 6cd583493b..608ce29914 100644 --- a/ext/pdo_oci/oci_driver.c +++ b/ext/pdo_oci/oci_driver.c @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 7 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2015 The PHP Group | + | Copyright (c) 1997-2016 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 | diff --git a/ext/pdo_oci/oci_statement.c b/ext/pdo_oci/oci_statement.c index d6844d3f16..1d8eb51266 100644 --- a/ext/pdo_oci/oci_statement.c +++ b/ext/pdo_oci/oci_statement.c @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 7 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2015 The PHP Group | + | Copyright (c) 1997-2016 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 | diff --git a/ext/pdo_oci/pdo_oci.c b/ext/pdo_oci/pdo_oci.c index e6e9505c9d..9753f5fce3 100644 --- a/ext/pdo_oci/pdo_oci.c +++ b/ext/pdo_oci/pdo_oci.c @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 7 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2015 The PHP Group | + | Copyright (c) 1997-2016 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 | diff --git a/ext/pdo_oci/php_pdo_oci.h b/ext/pdo_oci/php_pdo_oci.h index aae58ae1ec..c827a9bf8e 100644 --- a/ext/pdo_oci/php_pdo_oci.h +++ b/ext/pdo_oci/php_pdo_oci.h @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 7 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2015 The PHP Group | + | Copyright (c) 1997-2016 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 | diff --git a/ext/pdo_oci/php_pdo_oci_int.h b/ext/pdo_oci/php_pdo_oci_int.h index fd01f0f7a8..682458438b 100644 --- a/ext/pdo_oci/php_pdo_oci_int.h +++ b/ext/pdo_oci/php_pdo_oci_int.h @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 7 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2015 The PHP Group | + | Copyright (c) 1997-2016 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 | |