Merge branch 'PHP-5.4' into PHP-5.5

Browse Source

* PHP-5.4:
  5.4.16-dev

Conflicts:
	configure.in
	main/php_version.h

...

This commit is contained in:

Stanislav Malyshev

2013-04-24 10:16:56 -07:00

parent 26bd2cba81 a58a279d7b

commit cf9db2154e

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