]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 85cc3b3 b90b551)
Merge branch 'PHP-5.5'
authorChristopher Jones <sixd@php.net>
Mon, 5 Aug 2013 21:28:24 +0000 (14:28 -0700)
committerChristopher Jones <sixd@php.net>
Mon, 5 Aug 2013 21:28:24 +0000 (14:28 -0700)
* PHP-5.5:
  Add an empty make command for DTrace .d files to stop an implicit circular dependency in GNU Make which causes .d files to be overwritten (Bug 61268)
  Merge branch 'PHP-5.4'

1  2 
acinclude.m4 patch | diff1 | diff2 | blob | history

diff --cc acinclude.m4
Simple merge
Unnamed repository; edit this file 'description' to name the repository.