]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e8a4477 0ebef46)
Merge branch 'PHP-5.4' into PHP-5.5
authorChristopher Jones <sixd@php.net>
Fri, 16 Aug 2013 17:49:05 +0000 (10:49 -0700)
committerChristopher Jones <sixd@php.net>
Fri, 16 Aug 2013 17:49:05 +0000 (10:49 -0700)
* PHP-5.4:
  With --enable-dtrace, the correct PIC/non-PIC .o files on Solaris and Linux are now used.  DTrace is part of Oracle Linux.  See https://oss.oracle.com/projects/DTrace/

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.