diff options
| author | Christopher Jones <sixd@php.net> | 2013-08-05 15:35:46 -0700 |
|---|---|---|
| committer | Christopher Jones <sixd@php.net> | 2013-08-05 15:35:46 -0700 |
| commit | 6e89818f2f0f5cff16ce319fdc2bde8d7aa8951d (patch) | |
| tree | 385ec7e9824dfb89ccc1bffebca324011659a1a3 | |
| parent | b90b551228c7dcc8399030c2cb0a12c72e9440f6 (diff) | |
| parent | 3bbe5931bc2b05ff8bcdf217bc6e79f5ac4cd692 (diff) | |
| download | php-git-6e89818f2f0f5cff16ce319fdc2bde8d7aa8951d.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* 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
0 files changed, 0 insertions, 0 deletions