com php-src: Merge branch 'PHP-5.5': acinclude.m4
| From: | Christopher Jones | Date: | Mon, 05 Aug 2013 21:28:24 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.5': acinclude.m4 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-72839@lists.php.net to get a copy of this message | ||
Commit: 8fdf1ad32d8d9a752b757f17c52757f32a462c3f
Author: Christopher Jones <sixd@php.net> Mon, 5 Aug 2013 14:28:24 -0700
Parents: 85cc3b324014c283366e7091fb45a85cc6fb74c8 b90b551228c7dcc8399030c2cb0a12c72e9440f6
Branches: master
Link: http://git.php.net/?p=php-src..git;a=commitdiff;h=8fdf1ad32d8d9a752b757f17c52757f32a462c3f
Log:
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'
Bugs:
https://bugs.php.net/61268
Changed paths:
MM acinclude..m4
Diff: