Merge branch 'PHP-5.4' into PHP-5.5

Browse Source

* PHP-5.4:
  branched 5.4.12
  update NEWS

Conflicts:
	configure.in
	main/php_version.h

...

This commit is contained in:

Stanislav Malyshev

2013-01-29 12:34:45 -08:00

parent 748b37654d 09b6e33b40

commit 26de5cc57f

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