Merge branch 'PHP-5.5' into PHP-5.6

Browse Source

* PHP-5.5:
  5.5.26 now

Conflicts:
	configure.in
	main/php_version.h

...

This commit is contained in:

Julien Pauli

2015-04-29 11:21:18 +02:00

parent ce9b6e5ee8 775d0707ca

commit d004c1d5ff

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

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

Diff Content Not Available