]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 8fdf1ad 18f1781)
Merge branch 'PHP-5.5'
authorChristopher Jones <sixd@php.net>
Mon, 5 Aug 2013 22:46:54 +0000 (15:46 -0700)
committerChristopher Jones <sixd@php.net>
Mon, 5 Aug 2013 22:46:54 +0000 (15:46 -0700)
commitca0497bba2222c282c39048776a9f61052e67643
tree331d0b0cb2c6599e1f261477212524907539a7actree | snapshot
parent8fdf1ad32d8d9a752b757f17c52757f32a462c3fcommit | diff
parent18f17818a697269fbd93b9ec234640b67972eb23commit | diff
Merge branch 'PHP-5.5'

* PHP-5.5:
  NEWS for recent DTrace merges. Remove redundant 'cp' during DTrace install.
  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
acinclude.m4 diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.