diff options
| author | Lior Kaplan <kaplanlior@gmail.com> | 2014-06-18 00:11:35 +0300 |
|---|---|---|
| committer | Lior Kaplan <kaplanlior@gmail.com> | 2014-06-18 00:11:35 +0300 |
| commit | d2bdedbcfcc0201789a916831d7aaf43b7eca10b (patch) | |
| tree | 8e0c21c92a9988b4ac900ff6765c19a36be42d4e | |
| parent | c38b73a701bf48321a586ef5a4e49ee4e368d486 (diff) | |
| parent | 4106d48d1c3e0800fe8610bee1f4462afd3d3955 (diff) | |
| download | php-git-d2bdedbcfcc0201789a916831d7aaf43b7eca10b.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Update copyright year to 2014
Update copyright year to 2014
| -rw-r--r-- | sapi/cli/php.1.in | 2 | ||||
| -rw-r--r-- | win32/build/template.rc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sapi/cli/php.1.in b/sapi/cli/php.1.in index 8672b3ba33..fff4363321 100644 --- 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 index 13e92e9a3b..f36f2c041c 100644 --- 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" |