]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit8fdf1ad32d8d9a752b757f17c52757f32a462c3f
tree3e29e68efcb54f284eb6b7464197f333112a97bdtree | snapshot
parent85cc3b324014c283366e7091fb45a85cc6fb74c8commit | diff
parentb90b551228c7dcc8399030c2cb0a12c72e9440f6commit | diff
Merge branch 'PHP-5.5'

* 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'
acinclude.m4 diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.