]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9accfee d82704b)
Merge branch 'PHP-5.4' into PHP-5.5
authorAnatol Belski <ab@php.net>
Thu, 16 May 2013 06:43:07 +0000 (08:43 +0200)
committerAnatol Belski <ab@php.net>
Thu, 16 May 2013 06:43:07 +0000 (08:43 +0200)
* PHP-5.4:
  Fixed bug #64853Use of no longer available ini directives causes crash on TS build

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.