Merge branch 'PHP-5.5' into PHP-5.6

Browse Source

Conflicts:
	main/php_version.h

...

This commit is contained in:

Xinchen Hui 2013-12-27 14:11:35 +08:00

parent 04a52443e7 aba76f09fa

commit 6908dc3e97

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