Merge branch 'PHP-5.4' into PHP-5.5

Browse Source

* PHP-5.4:
  5.4.24-dev now

Conflicts:
	configure.in
	main/php_version.h

...

This commit is contained in:

Stanislav Malyshev

2013-11-27 00:14:42 -08:00

parent 0fc90b100d 63f3ff7b5f

commit 5cd8ff9885

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