diff options
| author | Christopher Jones <sixd@php.net> | 2013-08-05 14:27:54 -0700 |
|---|---|---|
| committer | Christopher Jones <sixd@php.net> | 2013-08-05 14:27:54 -0700 |
| commit | b90b551228c7dcc8399030c2cb0a12c72e9440f6 (patch) | |
| tree | 385ec7e9824dfb89ccc1bffebca324011659a1a3 /sapi/cli/php_http_parser.h | |
| parent | 963c1be38db3fd4b31303ae28e72933c5873103f (diff) | |
| parent | ec4019e8f693fb68c8e282bb540812a10d99cba1 (diff) | |
| download | php-git-b90b551228c7dcc8399030c2cb0a12c72e9440f6.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
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'
Conflicts:
ext/mysqlnd/mysqlnd.c
Diffstat (limited to 'sapi/cli/php_http_parser.h')
0 files changed, 0 insertions, 0 deletions