summaryrefslogtreecommitdiff
path: root/ext/phar
diff options
context:
space:
mode:
authorChristopher Jones <sixd@php.net>2013-08-05 15:46:54 -0700
committerChristopher Jones <sixd@php.net>2013-08-05 15:46:54 -0700
commitca0497bba2222c282c39048776a9f61052e67643 (patch)
tree331d0b0cb2c6599e1f261477212524907539a7ac /ext/phar
parent8fdf1ad32d8d9a752b757f17c52757f32a462c3f (diff)
parent18f17818a697269fbd93b9ec234640b67972eb23 (diff)
downloadphp-git-ca0497bba2222c282c39048776a9f61052e67643.tar.gz
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
Diffstat (limited to 'ext/phar')
0 files changed, 0 insertions, 0 deletions