Merge branch 'PHP-5.6' into PHP-7.0

Browse Source

Conflicts:
	configure.in
	main/php_version.h

...

This commit is contained in:

Ferenc Kovacs 2016-09-29 00:58:02 +02:00

parent 83780a6cd2 703c247c7d

commit 581e890483

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available