summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorReeze Xia <reeze@php.net>2015-03-01 15:08:20 +0800
committerReeze Xia <reeze@php.net>2015-03-01 15:08:20 +0800
commit214350f4f44c006b1db2208e93bfaed6960b01b2 (patch)
tree26eaf0ecbe6bceeca1d336c73d63aaba9e0785e3
parent6ef477f947ec65bd5f71f2e4e016bbcc469f4257 (diff)
parentc98eb695b5b804a6892b020290a6589781e6126e (diff)
downloadphp-git-214350f4f44c006b1db2208e93bfaed6960b01b2.tar.gz
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5: Bump header year
-rw-r--r--header2
1 files changed, 1 insertions, 1 deletions
diff --git a/header b/header
index fcbcaea9e3..c54286c8bf 100644
--- a/header
+++ b/header
@@ -2,7 +2,7 @@
+----------------------------------------------------------------------+
| PHP Version 5 |
+----------------------------------------------------------------------+
- | Copyright (c) 1997-2014 The PHP Group |
+ | Copyright (c) 1997-2015 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 |