Julien Pauli 736b91c650 Merge branch 'PHP-5.6' into PHP-7.0 ...

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

Conflicts:
	ext/json/php_json_encoder.h
	sapi/continuity/capi.c

2016-01-04 18:13:38 +01:00

..

build

Merge branch 'PHP-5.6' into PHP-7.0

2016-01-04 18:13:38 +01:00

builddef.bat

…

dllmain.c

Happy new year (Update copyright to 2016)

2016-01-01 20:03:16 +02:00

fnmatch.c

add vim modelines

2015-05-20 19:14:05 +02:00

fnmatch.h

…

getrusage.c

Happy new year (Update copyright to 2016)

2016-01-01 20:03:16 +02:00

getrusage.h

Happy new year (Update copyright to 2016)

2016-01-01 20:03:16 +02:00

glob.c

cleanup more redundant S_IS* declarations

2015-05-25 18:03:26 +02:00

glob.h

trailing whitespace removal

2015-01-10 15:07:38 -08:00

globals.c

Merge branch 'PHP-5.6' into PHP-7.0

2016-01-01 19:48:25 +02:00

grp.h

Merge branch 'PHP-5.6' into PHP-7.0

2016-01-01 19:48:25 +02:00

inet.c

Happy new year (Update copyright to 2016)

2016-01-01 20:03:16 +02:00

inet.h

Happy new year (Update copyright to 2016)

2016-01-01 20:03:16 +02:00

install.txt

Merge branch 'PHP-5.6'

2015-08-18 21:26:09 +02:00

param.h

…

php7dllts.rc

Replaces php5 with php7, without whitespace changes.

2014-09-20 10:01:44 +02:00

php7dllts.rc2

Replaces php5 with php7, without whitespace changes.

2014-09-20 10:01:44 +02:00

php7ts_cli.rc

Replaces php5 with php7, without whitespace changes.

2014-09-20 10:01:44 +02:00

php7ts_cli.rc2

Replaces php5 with php7, without whitespace changes.

2014-09-20 10:01:44 +02:00

php7ts.rc

Replaces php5 with php7, without whitespace changes.

2014-09-20 10:01:44 +02:00

php7ts.rc2

Replaces php5 with php7, without whitespace changes.

2014-09-20 10:01:44 +02:00

php_inttypes.h

rather use the supplied inttypes.h with vc14

2015-10-23 09:47:00 +02:00

php_registry.h

Happy new year (Update copyright to 2016)

2016-01-01 20:03:16 +02:00

php_stdbool.h

trailing whitespace removal

2015-01-10 15:07:38 -08:00

php_stdint.h

trailing whitespace removal

2015-01-10 15:07:38 -08:00

php_win32_globals.h

Merge branch 'PHP-5.6' into PHP-7.0

2016-01-01 19:48:25 +02:00

readdir.c

add vim modelines

2015-05-20 19:14:05 +02:00

readdir.h

Fix #36365: scandir duplicates file name at every 65535th file

2015-07-28 01:04:55 +02:00

registry.c

Happy new year (Update copyright to 2016)

2016-01-01 20:03:16 +02:00

resource.h

trailing whitespace removal

2015-01-10 15:07:38 -08:00

select.c

Merge branch 'PHP-5.6' into PHP-7.0

2016-01-01 19:48:25 +02:00

select.h

Merge branch 'PHP-5.6' into PHP-7.0

2016-01-01 19:48:25 +02:00

sendmail.c

Fix bug #70145 From field incorrectly parsed from headers

2015-08-19 11:05:35 +02:00

sendmail.h

trailing whitespace removal

2015-01-10 15:07:38 -08:00

signal.h

remove version check

2015-05-15 08:20:33 +02:00

sockets.c

Merge branch 'PHP-5.6' into PHP-7.0

2016-01-01 19:48:25 +02:00

sockets.h

Merge branch 'PHP-5.6' into PHP-7.0

2016-01-01 19:48:25 +02:00

syslog.h

Merge branch 'PHP-5.6' into PHP-7.0

2016-01-01 19:48:25 +02:00

syslog.reg

Replaces php5 with php7, without whitespace changes.

2014-09-20 10:01:44 +02:00

time.c

introduced DllMain for the main php DLL

2015-06-02 15:56:32 +02:00

time.h

introduced DllMain for the main php DLL

2015-06-02 15:56:32 +02:00

unistd.h

…

winutil.c

Merge branch 'PHP-5.6' into PHP-7.0

2016-01-01 19:48:25 +02:00

winutil.h

Merge branch 'PHP-5.6' into PHP-7.0

2016-01-01 19:48:25 +02:00

wsyslog.c

add vim modelines

2015-05-20 19:14:05 +02:00