Merge branch 'PHP-5.4' into PHP-5.5

Browse Source

* PHP-5.4:
  Fixed bug #62691 (solaris sed has no -i switch) Make 'make distclean' remove generated DTrace .h file
  Enable dtrace probes on linux as they are compatible with systemtap
  Fixed bug #63706: Cannot build PHP-5.5 with --enable-dtrace on Fedora 17

Conflicts:
	Makefile.global

...

This commit is contained in:

Christopher Jones 2013-08-05 15:35:46 -07:00

parent b90b551228 3bbe5931bc

commit 6e89818f2f

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