diff options
| author | Christopher Jones <sixd@php.net> | 2013-08-05 14:28:24 -0700 |
|---|---|---|
| committer | Christopher Jones <sixd@php.net> | 2013-08-05 14:28:24 -0700 |
| commit | 8fdf1ad32d8d9a752b757f17c52757f32a462c3f (patch) | |
| tree | 3e29e68efcb54f284eb6b7464197f333112a97bd /sapi/cli/php_http_parser.h | |
| parent | 85cc3b324014c283366e7091fb45a85cc6fb74c8 (diff) | |
| parent | b90b551228c7dcc8399030c2cb0a12c72e9440f6 (diff) | |
| download | php-git-8fdf1ad32d8d9a752b757f17c52757f32a462c3f.tar.gz | |
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'
Diffstat (limited to 'sapi/cli/php_http_parser.h')
0 files changed, 0 insertions, 0 deletions