Merge branch 'PHP-5.4' into PHP-5.5

Browse Source

* PHP-5.4:
  5.4.40 next

Conflicts:
	configure.in
	main/php_version.h

...

This commit is contained in:

Stanislav Malyshev 2015-03-17 22:39:10 -07:00

parent 210cfafc2b 4c3b73b6df

commit de0cee2f39

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

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

Diff Content Not Available