]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b90b551 3bbe593)
Merge branch 'PHP-5.4' into PHP-5.5
authorChristopher Jones <sixd@php.net>
Mon, 5 Aug 2013 22:35:46 +0000 (15:35 -0700)
committerChristopher Jones <sixd@php.net>
Mon, 5 Aug 2013 22:35:46 +0000 (15:35 -0700)
* 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


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.