Merge branch 'PHP-5.4' into PHP-5.5

Browse source

* PHP-5.4:
  5.4.11-dev

Conflicts:
	configure.in
	main/php_version.h

...

This commit is contained in:

Stanislav Malyshev 2012-12-04 21:33:31 -08:00

parent 266059d6f0 c3b6f6feed

commit 16b1d45e69

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 is not available