]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 44697c1 00a7b1f)
Merge branch 'PHP-5.5' into PHP-5.6
authorSara Golemon <pollita@php.net>
Wed, 4 Dec 2013 02:21:12 +0000 (18:21 -0800)
committerSara Golemon <pollita@php.net>
Wed, 4 Dec 2013 02:21:12 +0000 (18:21 -0800)
* PHP-5.5:
  Fix php_module_startup() when loading more than one additional module

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.