Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4: Update copyright year to 2014 Update copyright year to 2014
12 years ago · d2bdedbcfc
2 changed files with 2 additions and 2 deletions
--- a/sapi/cli/php.1.in
+++ b/sapi/cli/php.1.in
@ -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
--- a/win32/build/template.rc
+++ b/win32/build/template.rc
@ -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"