Merge branch 'PHP-5.4' into PHP-5.5

Browse Source

* PHP-5.4:
  5.4.34 is next

Conflicts:
	configure.in
	main/php_version.h

...

This commit is contained in:

Stanislav Malyshev

2014-09-02 15:03:54 -07:00

parent 70f92aa97e 5e95b61639

commit a734acd439

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