diff options
| author | Christopher Jones <sixd@php.net> | 2013-08-16 10:49:05 -0700 |
|---|---|---|
| committer | Christopher Jones <sixd@php.net> | 2013-08-16 10:49:05 -0700 |
| commit | 4b4ffaf703a243db6bb1026a339376d089dec72d (patch) | |
| tree | b29882256dc610747dff6da8943693d3187812a0 /ext/json/tests/bug53946.phpt | |
| parent | e8a4477a4836b552557a483d803e0b1c29224c2a (diff) | |
| parent | 0ebef462ceb50094e64a8d48bf705594175f86ab (diff) | |
| download | php-git-4b4ffaf703a243db6bb1026a339376d089dec72d.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* 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/
Diffstat (limited to 'ext/json/tests/bug53946.phpt')
0 files changed, 0 insertions, 0 deletions