Merge branch 'PHP-5.4' into PHP-5.5

kaplanlior · kaplanlior · commit d2bdedbcfcc0 · 2014-06-18T00:11:35.000+03:00
* PHP-5.4:
  Update copyright year to 2014
  Update copyright year to 2014
diff --git 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
diff --git 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"

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-.TH PHP 1 "2013" "The PHP Group" "Scripting Language"`
	`1`	`+.TH PHP 1 "2014" "The PHP Group" "Scripting Language"`
`2`	`2`	`.SH NAME`
`3`	`3`	`php \- PHP Command Line Interface 'CLI'`
`4`	`4`	`.P`