mirror of
https://github.com/php/php-src.git
synced 2024-09-22 02:17:32 +00:00
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5: Update copyright year to 2014 Update copyright year to 2014 Update copyright year to 2014 Update copyright year to 2014
This commit is contained in:
commit
1222f51ebd
2
LICENSE
2
LICENSE
@ -1,6 +1,6 @@
|
||||
--------------------------------------------------------------------
|
||||
The PHP License, version 3.01
|
||||
Copyright (c) 1999 - 2012 The PHP Group. All rights reserved.
|
||||
Copyright (c) 1999 - 2014 The PHP Group. All rights reserved.
|
||||
--------------------------------------------------------------------
|
||||
|
||||
Redistribution and use in source and binary forms, with or without
|
||||
|
@ -2,7 +2,7 @@
|
||||
+----------------------------------------------------------------------+
|
||||
| PHP Version 5 |
|
||||
+----------------------------------------------------------------------+
|
||||
| Copyright (c) 1997-2012 The PHP Group |
|
||||
| Copyright (c) 1997-2014 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 |
|
||||
|
@ -2,7 +2,7 @@
|
||||
+----------------------------------------------------------------------+
|
||||
| PHP Version 5 |
|
||||
+----------------------------------------------------------------------+
|
||||
| Copyright (c) 1997-2012 The PHP Group |
|
||||
| Copyright (c) 1997-2014 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 |
|
||||
|
@ -1,4 +1,4 @@
|
||||
.TH PHP 1 "2013" "The PHP Group" "Scripting Language"
|
||||
.TH PHP 1 "2014" "The PHP Group" "Scripting Language"
|
||||
.SH NAME
|
||||
php \- PHP Command Line Interface 'CLI'
|
||||
.P
|
||||
|
@ -65,7 +65,7 @@ BEGIN
|
||||
#endif
|
||||
VALUE "FileVersion", EXT_VERSION
|
||||
VALUE "InternalName", INTERNAL_NAME
|
||||
VALUE "LegalCopyright", "Copyright © 1997-2013 The PHP Group"
|
||||
VALUE "LegalCopyright", "Copyright © 1997-2014 The PHP Group"
|
||||
VALUE "LegalTrademarks", "PHP"
|
||||
VALUE "OriginalFilename", FILE_NAME
|
||||
VALUE "ProductName", "PHP"
|
||||
|
Loading…
Reference in New Issue
Block a user