]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5'
authorChristopher Jones <sixd@php.net>
Wed, 31 Jul 2013 17:00:05 +0000 (10:00 -0700)
committerChristopher Jones <sixd@php.net>
Wed, 31 Jul 2013 17:00:05 +0000 (10:00 -0700)
* PHP-5.5:
  Fixed bug #62691 (solaris sed has no -i switch) Make 'make distclean' remove generated DTrace .h file

1  2 
Makefile.global

diff --cc Makefile.global
Simple merge