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
12 years ago · 1222f51ebd
5 changed files with 5 additions and 5 deletions
--- a/2
+++ b/2
@ -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
--- a/ext/sockets/sendrecvmsg.c
+++ b/ext/sockets/sendrecvmsg.c
@ -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        |
--- a/ext/sockets/windows_common.h
+++ b/ext/sockets/windows_common.h
@ -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        |
--- 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"