archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-5.6' into PHP-7.0

Browse source 
* PHP-5.6:
  Happy new year (Update copyright to 2016)

Conflicts:
	ext/json/php_json_encoder.h
	sapi/continuity/capi.c
This commit is contained in:
Julien Pauli 2016-01-04 18:13:38 +01:00
commit 736b91c650
14 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
scripts/man1/php-config.1.in
View file

@ -1,4 +1,4 @@
.TH @program_prefix@php\-config 1 "2014" "The PHP Group" "Scripting Language"
.TH @program_prefix@php\-config 1 "2016" "The PHP Group" "Scripting Language"
.SH NAME
@program_prefix@php\-config \- get information about PHP configuration and compile options
.SH SYNOPSIS

2
scripts/man1/phpize.1.in
View file

@ -1,4 +1,4 @@
.TH @program_prefix@phpize 1 "2014" "The PHP Group" "Scripting Language"
.TH @program_prefix@phpize 1 "2016" "The PHP Group" "Scripting Language"
.SH NAME
@program_prefix@phpize \- prepare a PHP extension for compiling
.SH SYNOPSIS