]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3ce6ad9 632fc51)
Merge branch 'PHP-5.6' into PHP-7.0
authorAnatol Belski <ab@php.net>
Thu, 18 Feb 2016 18:14:22 +0000 (19:14 +0100)
committerAnatol Belski <ab@php.net>
Thu, 18 Feb 2016 18:14:22 +0000 (19:14 +0100)
* PHP-5.6:
  Bug #71596 Segmentation fault on ZTS with date function (setlocale)

1  2 
main/main.c patch | diff1 | diff2 | blob | history

diff --cc main/main.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.