summaryrefslogtreecommitdiff
path: root/ext/xml
diff options
context:
space:
mode:
authorLior Kaplan <kaplanlior@gmail.com>2016-01-01 19:47:16 +0200
committerLior Kaplan <kaplanlior@gmail.com>2016-01-01 19:48:25 +0200
commited35de784f4ea53927e906ba4af335778de4d16a (patch)
tree3b95626566e3447a23890e63e8450c1611f26eba /ext/xml
parent87958927b0cef17ba06a8739c7febca8e920c6de (diff)
parent49493a2dcfb2cd1758b69b13d9006ead3be0e066 (diff)
downloadphp-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/xml')
-rw-r--r--ext/xml/compat.c2
-rw-r--r--ext/xml/expat_compat.h2
-rw-r--r--ext/xml/php_xml.h2
-rw-r--r--ext/xml/xml.c2
4 files changed, 4 insertions, 4 deletions
diff --git a/ext/xml/compat.c b/ext/xml/compat.c
index df0879dea4..3fc203ee23 100644
--- a/ext/xml/compat.c
+++ b/ext/xml/compat.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/xml/expat_compat.h b/ext/xml/expat_compat.h
index 420bedd19d..75f2885148 100644
--- a/ext/xml/expat_compat.h
+++ b/ext/xml/expat_compat.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/xml/php_xml.h b/ext/xml/php_xml.h
index 8f92eefe1d..0aa55a5fac 100644
--- a/ext/xml/php_xml.h
+++ b/ext/xml/php_xml.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/xml/xml.c b/ext/xml/xml.c
index 3a300c8e7e..d6eae46583 100644
--- a/ext/xml/xml.c
+++ b/ext/xml/xml.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 |